From 5fd08bcddb02bca67b43a80f39e6a4ddefa65be2 Mon Sep 17 00:00:00 2001 From: Alberto97 Date: Sat, 6 Jan 2018 18:24:37 +0100 Subject: [PATCH] sanders: Directly copy wlan files * Symlinks are no more required, kill them --- device.mk | 17 +++---- wifi/Android.mk | 133 ------------------------------------------------ 2 files changed, 8 insertions(+), 142 deletions(-) delete mode 100644 wifi/Android.mk diff --git a/device.mk b/device.mk index 3f297df..77133d4 100644 --- a/device.mk +++ b/device.mk @@ -375,23 +375,20 @@ PRODUCT_PACKAGES += \ # Wifi PRODUCT_PACKAGES += \ - hostapd_default.conf \ + android.hardware.wifi@1.0-service \ hostapd \ + libqsap_sdk \ + libwpa_client \ + wcnss_service \ + wificond \ + wifilogd \ wpa_supplicant \ wpa_supplicant.conf -PRODUCT_PACKAGES += \ - p2p_supplicant_overlay.conf \ - wpa_supplicant_overlay.conf - # Launcher3 PRODUCT_PACKAGES += \ Launcher3 -# WiFi HAL -PRODUCT_PACKAGES += \ - android.hardware.wifi@1.0-service - #Thermal PRODUCT_PACKAGES += android.hardware.thermal@1.0-impl \ android.hardware.thermal@1.0-service \ @@ -417,6 +414,8 @@ PRODUCT_PACKAGES += \ PRODUCT_COPY_FILES += \ kernel/motorola/msm8953/drivers/staging/prima/firmware_bin/WCNSS_cfg.dat:$(TARGET_COPY_OUT_VENDOR)/firmware/wlan/prima/WCNSS_cfg.dat \ + $(LOCAL_PATH)/wifi/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf \ + $(LOCAL_PATH)/wifi/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf \ $(LOCAL_PATH)/wifi/WCNSS_qcom_cfg.ini:$(TARGET_COPY_OUT_VENDOR)/firmware/wlan/prima/WCNSS_qcom_cfg.ini PRODUCT_BUILD_PROP_OVERRIDES += BUILD_UTC_DATE=0 diff --git a/wifi/Android.mk b/wifi/Android.mk deleted file mode 100644 index 1019605..0000000 --- a/wifi/Android.mk +++ /dev/null @@ -1,133 +0,0 @@ -LOCAL_PATH:= $(call my-dir) - -#---------------------------------------------------------------------- -# Copy additional target-specific files -#---------------------------------------------------------------------- - -include $(CLEAR_VARS) -LOCAL_MODULE := hostapd_default.conf -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := ETC -LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/hostapd -LOCAL_SRC_FILES := hostapd_default.conf -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := p2p_supplicant_overlay.conf -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := ETC -LOCAL_SRC_FILES := $(LOCAL_MODULE) -LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/etc/wifi -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := wpa_supplicant_overlay.conf -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := ETC -LOCAL_SRC_FILES := $(LOCAL_MODULE) -LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/etc/wifi -include $(BUILD_PREBUILT) - -#---------------------------------------------------------------------- -# Symlinks -#---------------------------------------------------------------------- - -include $(CLEAR_VARS) -LOCAL_MODULE := WCNSS_qcom_cfg.ini -LOCAL_MODULE_CLASS := FAKE -LOCAL_MODULE_TAGS := optional -include $(BUILD_SYSTEM)/base_rules.mk -$(LOCAL_BUILT_MODULE): TARGET := /vendor/firmware/wlan/prima/$(LOCAL_MODULE) -$(LOCAL_BUILT_MODULE): SYMLINK := $(TARGET_OUT_VENDOR)/etc/wifi/$(LOCAL_MODULE) -$(LOCAL_BUILT_MODULE): - $(hide) echo "Symlink: $(SYMLINK) -> $(TARGET)" - $(hide) mkdir -p $(dir $@) - $(hide) mkdir -p $(dir $(SYMLINK)) - $(hide) rm -rf $@ - $(hide) rm -rf $(SYMLINK) - $(hide) ln -sf $(TARGET) $(SYMLINK) - $(hide) touch $@ - -include $(CLEAR_VARS) -LOCAL_MODULE := WCNSS_qcom_wlan_nv.bin -LOCAL_MODULE_CLASS := FAKE -LOCAL_MODULE_TAGS := optional -include $(BUILD_SYSTEM)/base_rules.mk -$(LOCAL_BUILT_MODULE): TARGET := /vendor/firmware/wlan/prima/$(LOCAL_MODULE) -$(LOCAL_BUILT_MODULE): SYMLINK := $(TARGET_OUT_VENDOR)/etc/wifi/$(LOCAL_MODULE) -$(LOCAL_BUILT_MODULE): - $(hide) echo "Symlink: $(SYMLINK) -> $(TARGET)" - $(hide) mkdir -p $(dir $@) - $(hide) mkdir -p $(dir $(SYMLINK)) - $(hide) rm -rf $@ - $(hide) rm -rf $(SYMLINK) - $(hide) ln -sf $(TARGET) $(SYMLINK) - $(hide) touch $@ - - -include $(CLEAR_VARS) -LOCAL_MODULE := WCNSS_qcom_wlan_nv_Argentina.bin -LOCAL_MODULE_CLASS := FAKE -LOCAL_MODULE_TAGS := optional -include $(BUILD_SYSTEM)/base_rules.mk -$(LOCAL_BUILT_MODULE): TARGET := /vendor/firmware/wlan/prima/$(LOCAL_MODULE) -$(LOCAL_BUILT_MODULE): SYMLINK := $(TARGET_OUT_VENDOR)/etc/wifi/$(LOCAL_MODULE) -$(LOCAL_BUILT_MODULE): - $(hide) echo "Symlink: $(SYMLINK) -> $(TARGET)" - $(hide) mkdir -p $(dir $@) - $(hide) mkdir -p $(dir $(SYMLINK)) - $(hide) rm -rf $@ - $(hide) rm -rf $(SYMLINK) - $(hide) ln -sf $(TARGET) $(SYMLINK) - $(hide) touch $@ - - -include $(CLEAR_VARS) -LOCAL_MODULE := WCNSS_qcom_wlan_nv_Brazil.bin -LOCAL_MODULE_CLASS := FAKE -LOCAL_MODULE_TAGS := optional -include $(BUILD_SYSTEM)/base_rules.mk -$(LOCAL_BUILT_MODULE): TARGET := /vendor/firmware/wlan/prima/$(LOCAL_MODULE) -$(LOCAL_BUILT_MODULE): SYMLINK := $(TARGET_OUT_VENDOR)/etc/wifi/$(LOCAL_MODULE) -$(LOCAL_BUILT_MODULE): - $(hide) echo "Symlink: $(SYMLINK) -> $(TARGET)" - $(hide) mkdir -p $(dir $@) - $(hide) mkdir -p $(dir $(SYMLINK)) - $(hide) rm -rf $@ - $(hide) rm -rf $(SYMLINK) - $(hide) ln -sf $(TARGET) $(SYMLINK) - $(hide) touch $@ - - -include $(CLEAR_VARS) -LOCAL_MODULE := WCNSS_qcom_wlan_nv_India.bin -LOCAL_MODULE_CLASS := FAKE -LOCAL_MODULE_TAGS := optional -include $(BUILD_SYSTEM)/base_rules.mk -$(LOCAL_BUILT_MODULE): TARGET := /vendor/firmware/wlan/prima/$(LOCAL_MODULE) -$(LOCAL_BUILT_MODULE): SYMLINK := $(TARGET_OUT_VENDOR)/etc/wifi/$(LOCAL_MODULE) -$(LOCAL_BUILT_MODULE): - $(hide) echo "Symlink: $(SYMLINK) -> $(TARGET)" - $(hide) mkdir -p $(dir $@) - $(hide) mkdir -p $(dir $(SYMLINK)) - $(hide) rm -rf $@ - $(hide) rm -rf $(SYMLINK) - $(hide) ln -sf $(TARGET) $(SYMLINK) - $(hide) touch $@ - -include $(CLEAR_VARS) -LOCAL_MODULE := WCNSS_wlan_dictionary.dat -LOCAL_MODULE_CLASS := FAKE -LOCAL_MODULE_TAGS := optional -include $(BUILD_SYSTEM)/base_rules.mk -$(LOCAL_BUILT_MODULE): TARGET := /vendor/firmware/wlan/prima/$(LOCAL_MODULE) -$(LOCAL_BUILT_MODULE): SYMLINK := $(TARGET_OUT_VENDOR)/etc/wifi/$(LOCAL_MODULE) -$(LOCAL_BUILT_MODULE): - $(hide) echo "Symlink: $(SYMLINK) -> $(TARGET)" - $(hide) mkdir -p $(dir $@) - $(hide) mkdir -p $(dir $(SYMLINK)) - $(hide) rm -rf $@ - $(hide) rm -rf $(SYMLINK) - $(hide) ln -sf $(TARGET) $(SYMLINK) - $(hide) touch $@ -