| -rw-r--r-- | core_amlogic.mk | 8 | ||||
| -rw-r--r-- | factory.mk | 8 | ||||
| -rw-r--r-- | init.amlogic.wifi.rc | 2 | ||||
| -rw-r--r-- | media.mk | 9 | ||||
| -rw-r--r-- | products/mbox/init.amlogic.rc | 10 | ||||
| -rw-r--r-- | products/tablet/init.amlogic.rc | 10 | ||||
| -rw-r--r-- | products/tv/init.amlogic.rc | 10 | ||||
| -rw-r--r-- | recovery/ubootenv/Android.mk | 2 | ||||
| -rw-r--r-- | software.mk | 3 | ||||
| -rw-r--r-- | wifi.mk | 265 |
10 files changed, 115 insertions, 212 deletions
@@ -82,11 +82,8 @@ PRODUCT_PACKAGES += \ dhd PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.wifi.direct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.direct.xml -ifneq ($(BOARD_USES_RECOVERY_AS_BOOT), true) -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_bcm.rc:root/init.amlogic.wifi.rc -else -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_bcm.rc:recovery/root/init.amlogic.wifi.rc -endif + +PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_bcm.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.wifi.rc ifneq ($(wildcard $(TARGET_PRODUCT_DIR)/dhd.ko),) PRODUCT_COPY_FILES += $(TARGET_PRODUCT_DIR)/dhd.ko:$(PRODUCT_OUT)/obj/lib_vendor/dhd.ko @@ -132,11 +129,8 @@ PRODUCT_PACKAGES += \ dhd PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.wifi.direct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.direct.xml -ifneq ($(BOARD_USES_RECOVERY_AS_BOOT), true) -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_bcm.rc:root/init.amlogic.wifi.rc -else -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_bcm.rc:recovery/root/init.amlogic.wifi.rc -endif + +PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_bcm.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.wifi.rc ifneq ($(wildcard $(TARGET_PRODUCT_DIR)/dhd.ko),) PRODUCT_COPY_FILES += $(TARGET_PRODUCT_DIR)/dhd.ko:$(PRODUCT_OUT)/obj/lib_vendor/dhd.ko @@ -177,11 +171,9 @@ PRODUCT_PACKAGES += \ dhd PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.wifi.direct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.direct.xml -ifneq ($(BOARD_USES_RECOVERY_AS_BOOT), true) -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_bcm.rc:root/init.amlogic.wifi.rc -else -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_bcm.rc:recovery/root/init.amlogic.wifi.rc -endif + +PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_bcm.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.wifi.rc + PRODUCT_COPY_FILES += device/amlogic/common/wifi/config.txt:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/4358/config.txt PRODUCT_COPY_FILES += hardware/amlogic/wifi/bcm_ampak/config/4358/config.txt:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/4358/config.txt @@ -224,11 +216,8 @@ PRODUCT_PACKAGES += \ dhd PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.wifi.direct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.direct.xml -ifneq ($(BOARD_USES_RECOVERY_AS_BOOT), true) -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_bcm.rc:root/init.amlogic.wifi.rc -else -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_bcm.rc:recovery/root/init.amlogic.wifi.rc -endif + +PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_bcm.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.wifi.rc ifneq ($(wildcard $(TARGET_PRODUCT_DIR)/dhd.ko),) PRODUCT_COPY_FILES += $(TARGET_PRODUCT_DIR)/dhd.ko:$(PRODUCT_OUT)/obj/lib_vendor/dhd.ko @@ -272,11 +261,8 @@ PRODUCT_PACKAGES += \ PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.wifi.direct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.direct.xml -ifneq ($(BOARD_USES_RECOVERY_AS_BOOT), true) -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_bcm.rc:root/init.amlogic.wifi.rc -else -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_bcm.rc:recovery/root/init.amlogic.wifi.rc -endif + +PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_bcm.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.wifi.rc PRODUCT_PROPERTY_OVERRIDES += \ wifi.interface=wlan0 @@ -315,11 +301,9 @@ PRODUCT_PACKAGES += \ PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.wifi.direct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.direct.xml -ifneq ($(BOARD_USES_RECOVERY_AS_BOOT), true) -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_bcm.rc:root/init.amlogic.wifi.rc -else -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_bcm.rc:recovery/root/init.amlogic.wifi.rc -endif + +PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_bcm.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.wifi.rc + PRODUCT_PROPERTY_OVERRIDES += \ wifi.interface=wlan0 endif @@ -349,11 +333,8 @@ PRODUCT_PACKAGES += \ wpa_supplicant_overlay.conf \ p2p_supplicant_overlay.conf PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.wifi.direct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.direct.xml -ifneq ($(BOARD_USES_RECOVERY_AS_BOOT), true) -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:root/init.amlogic.wifi.rc -else -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:recovery/root/init.amlogic.wifi.rc -endif + +PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.wifi.rc ifneq ($(wildcard $(TARGET_PRODUCT_DIR)/8189es.ko),) PRODUCT_COPY_FILES += $(TARGET_PRODUCT_DIR)/8189es.ko:$(PRODUCT_OUT)/obj/lib_vendor/8189es.ko @@ -390,11 +371,8 @@ PRODUCT_PACKAGES += \ p2p_supplicant_overlay.conf PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.wifi.direct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.direct.xml -ifneq ($(BOARD_USES_RECOVERY_AS_BOOT), true) -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:root/init.amlogic.wifi.rc -else -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:recovery/root/init.amlogic.wifi.rc -endif + +PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.wifi.rc ifneq ($(wildcard $(TARGET_PRODUCT_DIR)/8189fs.ko),) PRODUCT_COPY_FILES += $(TARGET_PRODUCT_DIR)/8189fs.ko:$(PRODUCT_OUT)/obj/lib_vendor/8189fs.ko @@ -430,11 +408,9 @@ PRODUCT_PACKAGES += \ wpa_supplicant_overlay.conf \ p2p_supplicant_overlay.conf PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.wifi.direct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.direct.xml -ifneq ($(BOARD_USES_RECOVERY_AS_BOOT), true) -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:root/init.amlogic.wifi.rc -else -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:recovery/root/init.amlogic.wifi.rc -endif + +PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.wifi.rc + ifneq ($(wildcard $(TARGET_PRODUCT_DIR)/8723bs.ko),) PRODUCT_COPY_FILES += $(TARGET_PRODUCT_DIR)/8723bs.ko:$(PRODUCT_OUT)/obj/lib_vendor/8723bs.ko endif @@ -469,11 +445,9 @@ WIFI_DRIVER_FW_PATH_P2P := "" WIFI_DRIVER_FW_PATH_PARAM := "" PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.wifi.direct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.direct.xml -ifneq ($(BOARD_USES_RECOVERY_AS_BOOT), true) -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:root/init.amlogic.wifi.rc -else -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:recovery/root/init.amlogic.wifi.rc -endif + +PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.wifi.rc + PRODUCT_PROPERTY_OVERRIDES += \ wifi.interface=wlan0 @@ -505,7 +479,7 @@ WIFI_DRIVER_FW_PATH_P2P := "" WIFI_DRIVER_FW_PATH_PARAM := "" PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.wifi.direct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.direct.xml -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:root/init.amlogic.wifi.rc +PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.wifi.rc PRODUCT_PROPERTY_OVERRIDES += \ wifi.interface=wlan0 @@ -538,7 +512,7 @@ WIFI_DRIVER_FW_PATH_P2P := "" WIFI_DRIVER_FW_PATH_PARAM := "" PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.wifi.direct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.direct.xml -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:root/init.amlogic.wifi.rc +PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.wifi.rc PRODUCT_PROPERTY_OVERRIDES += \ wifi.interface=wlan0 @@ -575,11 +549,8 @@ PRODUCT_PACKAGES += \ dhd PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.wifi.direct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.direct.xml -ifneq ($(BOARD_USES_RECOVERY_AS_BOOT), true) -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_bcm.rc:root/init.amlogic.wifi.rc -else -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_bcm.rc:recovery/root/init.amlogic.wifi.rc -endif + +PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_bcm.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.wifi.rc ifneq ($(wildcard $(TARGET_PRODUCT_DIR)/dhd.ko),) PRODUCT_COPY_FILES += $(TARGET_PRODUCT_DIR)/dhd.ko:$(PRODUCT_OUT)/obj/lib_vendor/dhd.ko @@ -622,11 +593,8 @@ PRODUCT_PACKAGES += \ dhd PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.wifi.direct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.direct.xml -ifneq ($(BOARD_USES_RECOVERY_AS_BOOT), true) -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_bcm.rc:root/init.amlogic.wifi.rc -else -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_bcm.rc:recovery/root/init.amlogic.wifi.rc -endif + +PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_bcm.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.wifi.rc ifneq ($(wildcard $(TARGET_PRODUCT_DIR)/dhd.ko),) PRODUCT_COPY_FILES += $(TARGET_PRODUCT_DIR)/dhd.ko:$(PRODUCT_OUT)/obj/lib_vendor/dhd.ko @@ -666,11 +634,8 @@ PRODUCT_PACKAGES += \ dhd PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.wifi.direct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.direct.xml -ifneq ($(BOARD_USES_RECOVERY_AS_BOOT), true) -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_bcm.rc:root/init.amlogic.wifi.rc -else -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_bcm.rc:recovery/root/init.amlogic.wifi.rc -endif + +PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_bcm.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.wifi.rc ifneq ($(wildcard $(TARGET_PRODUCT_DIR)/dhd.ko),) PRODUCT_COPY_FILES += $(TARGET_PRODUCT_DIR)/dhd.ko:$(PRODUCT_OUT)/obj/lib_vendor/dhd.ko @@ -717,11 +682,9 @@ PRODUCT_PACKAGES += \ dhd PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.wifi.direct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.direct.xml -ifneq ($(BOARD_USES_RECOVERY_AS_BOOT), true) -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_bcm.rc:root/init.amlogic.wifi.rc -else -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_bcm.rc:recovery/root/init.amlogic.wifi.rc -endif + +PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_bcm.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.wifi.rc + ifneq ($(wildcard $(TARGET_PRODUCT_DIR)/dhd.ko),) PRODUCT_COPY_FILES += $(TARGET_PRODUCT_DIR)/dhd.ko:$(PRODUCT_OUT)/obj/lib_vendor/dhd.ko endif @@ -759,11 +722,9 @@ PRODUCT_PACKAGES += \ dhd PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.wifi.direct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.direct.xml -ifneq ($(BOARD_USES_RECOVERY_AS_BOOT), true) -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_bcm.rc:root/init.amlogic.wifi.rc -else -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_bcm.rc:recovery/root/init.amlogic.wifi.rc -endif + +PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_bcm.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.wifi.rc + ifneq ($(wildcard $(TARGET_PRODUCT_DIR)/dhd.ko),) PRODUCT_COPY_FILES += $(TARGET_PRODUCT_DIR)/dhd.ko:$(PRODUCT_OUT)/obj/lib_vendor/dhd.ko endif @@ -802,11 +763,8 @@ PRODUCT_PACKAGES += \ dhd PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.wifi.direct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.direct.xml -ifneq ($(BOARD_USES_RECOVERY_AS_BOOT), true) -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_bcm.rc:root/init.amlogic.wifi.rc -else -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_bcm.rc:recovery/root/init.amlogic.wifi.rc -endif + +PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_bcm.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.wifi.rc ifneq ($(wildcard $(TARGET_PRODUCT_DIR)/dhd.ko),) PRODUCT_COPY_FILES += $(TARGET_PRODUCT_DIR)/dhd.ko:$(PRODUCT_OUT)/obj/lib_vendor/dhd.ko @@ -844,11 +802,8 @@ PRODUCT_PACKAGES += \ dhd PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.wifi.direct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.direct.xml -ifneq ($(BOARD_USES_RECOVERY_AS_BOOT), true) -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_bcm.rc:root/init.amlogic.wifi.rc -else -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_bcm.rc:recovery/root/init.amlogic.wifi.rc -endif + +PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_bcm.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.wifi.rc ifneq ($(wildcard $(TARGET_PRODUCT_DIR)/dhd.ko),) PRODUCT_COPY_FILES += $(TARGET_PRODUCT_DIR)/dhd.ko:$(PRODUCT_OUT)/obj/lib_vendor/dhd.ko @@ -886,11 +841,8 @@ PRODUCT_PACKAGES += \ dhd PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.wifi.direct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.direct.xml -ifneq ($(BOARD_USES_RECOVERY_AS_BOOT), true) -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_bcm.rc:root/init.amlogic.wifi.rc -else -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_bcm.rc:recovery/root/init.amlogic.wifi.rc -endif + +PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_bcm.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.wifi.rc ifneq ($(wildcard $(TARGET_PRODUCT_DIR)/dhd.ko),) PRODUCT_COPY_FILES += $(TARGET_PRODUCT_DIR)/dhd.ko:$(PRODUCT_OUT)/obj/lib_vendor/dhd.ko @@ -928,11 +880,8 @@ PRODUCT_PACKAGES += \ dhd PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.wifi.direct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.direct.xml -ifneq ($(BOARD_USES_RECOVERY_AS_BOOT), true) -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_bcm.rc:root/init.amlogic.wifi.rc -else -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_bcm.rc:recovery/root/init.amlogic.wifi.rc -endif + +PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_bcm.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.wifi.rc ifneq ($(wildcard $(TARGET_PRODUCT_DIR)/bcmdhd.ko),) PRODUCT_COPY_FILES += $(TARGET_PRODUCT_DIR)/bcmdhd.ko:$(PRODUCT_OUT)/obj/lib_vendor/bcmdhd.ko @@ -969,11 +918,8 @@ PRODUCT_PACKAGES += \ dhd PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.wifi.direct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.direct.xml -ifneq ($(BOARD_USES_RECOVERY_AS_BOOT), true) -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_bcm.rc:root/init.amlogic.wifi.rc -else -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_bcm.rc:recovery/root/init.amlogic.wifi.rc -endif + +PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_bcm.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.wifi.rc ifneq ($(wildcard $(TARGET_PRODUCT_DIR)/bcmdhd.ko),) PRODUCT_COPY_FILES += $(TARGET_PRODUCT_DIR)/bcmdhd.ko:$(PRODUCT_OUT)/obj/lib_vendor/bcmdhd.ko @@ -1005,11 +951,8 @@ WIFI_FIRMWARE_LOADER := "" WIFI_DRIVER_FW_PATH_PARAM := "" PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.wifi.direct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.direct.xml -ifneq ($(BOARD_USES_RECOVERY_AS_BOOT), true) -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:root/init.amlogic.wifi.rc -else -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:recovery/root/init.amlogic.wifi.rc -endif + +PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.wifi.rc PRODUCT_PACKAGES += \ wpa_supplicant_overlay.conf \ @@ -1046,11 +989,8 @@ WIFI_FIRMWARE_LOADER := "wlan_fwloader" PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.wifi.direct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.direct.xml -ifneq ($(BOARD_USES_RECOVERY_AS_BOOT), true) -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:root/init.amlogic.wifi.rc -else -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:recovery/root/init.amlogic.wifi.rc -endif + +PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.wifi.rc PRODUCT_PACKAGES += \ wpa_supplicant_overlay.conf \ @@ -1087,11 +1027,8 @@ WIFI_FIRMWARE_LOADER := "" PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.wifi.direct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.direct.xml -ifneq ($(BOARD_USES_RECOVERY_AS_BOOT), true) -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:root/init.amlogic.wifi.rc -else -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:recovery/root/init.amlogic.wifi.rc -endif + +PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.wifi.rc PRODUCT_PACKAGES += \ wpa_supplicant_overlay.conf \ @@ -1123,11 +1060,8 @@ WIFI_FIRMWARE_LOADER := "" WIFI_DRIVER_FW_PATH_PARAM := "" PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.wifi.direct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.direct.xml -ifneq ($(BOARD_USES_RECOVERY_AS_BOOT), true) -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:root/init.amlogic.wifi.rc -else -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:recovery/root/init.amlogic.wifi.rc -endif + +PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.wifi.rc PRODUCT_PACKAGES += \ wpa_supplicant_overlay.conf \ @@ -1159,11 +1093,9 @@ WIFI_FIRMWARE_LOADER := "" WIFI_DRIVER_FW_PATH_PARAM := "" PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.wifi.direct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.direct.xml -ifneq ($(BOARD_USES_RECOVERY_AS_BOOT), true) -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:root/init.amlogic.wifi.rc -else -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:recovery/root/init.amlogic.wifi.rc -endif + +PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.wifi.rc + PRODUCT_PACKAGES += \ wpa_supplicant_overlay.conf \ p2p_supplicant_overlay.conf @@ -1194,11 +1126,8 @@ WIFI_FIRMWARE_LOADER := "" WIFI_DRIVER_FW_PATH_PARAM := "" PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.wifi.direct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.direct.xml -ifneq ($(BOARD_USES_RECOVERY_AS_BOOT), true) -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:root/init.amlogic.wifi.rc -else -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:recovery/root/init.amlogic.wifi.rc -endif + +PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.wifi.rc PRODUCT_PACKAGES += \ wpa_supplicant_overlay.conf \ @@ -1230,11 +1159,8 @@ WIFI_FIRMWARE_LOADER := "" WIFI_DRIVER_FW_PATH_PARAM := "" PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.wifi.direct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.direct.xml -ifneq ($(BOARD_USES_RECOVERY_AS_BOOT), true) -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:root/init.amlogic.wifi.rc -else -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:recovery/root/init.amlogic.wifi.rc -endif + +PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.wifi.rc PRODUCT_PROPERTY_OVERRIDES += \ wifi.interface=wlan0 @@ -1262,11 +1188,8 @@ WIFI_FIRMWARE_LOADER := "" WIFI_DRIVER_FW_PATH_PARAM := "" PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.wifi.direct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.direct.xml -ifneq ($(BOARD_USES_RECOVERY_AS_BOOT), true) -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:root/init.amlogic.wifi.rc -else -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:recovery/root/init.amlogic.wifi.rc -endif + +PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.wifi.rc PRODUCT_PACKAGES += \ wpa_supplicant_overlay.conf \ @@ -1298,11 +1221,8 @@ WIFI_FIRMWARE_LOADER := "" WIFI_DRIVER_FW_PATH_PARAM := "" PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.wifi.direct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.direct.xml -ifneq ($(BOARD_USES_RECOVERY_AS_BOOT), true) -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:root/init.amlogic.wifi.rc -else -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:recovery/root/init.amlogic.wifi.rc -endif + +PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.wifi.rc PRODUCT_PACKAGES += \ wpa_supplicant_overlay.conf \ p2p_supplicant_overlay.conf @@ -1335,11 +1255,8 @@ WIFI_FIRMWARE_LOADER := "" WIFI_DRIVER_FW_PATH_PARAM := "" PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.wifi.direct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.direct.xml -ifneq ($(BOARD_USES_RECOVERY_AS_BOOT), true) -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:root/init.amlogic.wifi.rc -else -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:recovery/root/init.amlogic.wifi.rc -endif + +PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.wifi.rc PRODUCT_PACKAGES += \ wpa_supplicant_overlay.conf \ @@ -1371,11 +1288,8 @@ endif PRODUCT_PROPERTY_OVERRIDES += \ wifi.interface=wlan0 -ifneq ($(BOARD_USES_RECOVERY_AS_BOOT), true) -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:root/init.amlogic.wifi.rc -else -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:recovery/root/init.amlogic.wifi.rc -endif + +PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.wifi.rc endif ################################################################################## mt7601u @@ -1393,7 +1307,7 @@ BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_mtk BOARD_WLAN_DEVICE := mtk PRODUCT_COPY_FILES += hardware/amlogic/wifi/mediatek/iwpriv:$(TARGET_COPY_OUT_VENDOR)/bin/iwpriv PRODUCT_COPY_FILES += hardware/amlogic/wifi/mediatek/RT2870STA_7601.dat:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/RT2870STA_7601.dat -PRODUCT_COPY_FILES += hardware/amlogic/wifi/mediatek/init.mtk.rc:root/init.mtk.rc +PRODUCT_COPY_FILES += hardware/amlogic/wifi/mediatek/init.mtk.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.mtk.rc PRODUCT_COPY_FILES += hardware/amlogic/wifi/mediatek/wpa_supplicant.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant.conf PRODUCT_COPY_FILES += hardware/amlogic/wifi/mediatek/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf PRODUCT_COPY_FILES += hardware/amlogic/wifi/mediatek/mt7601usta.ko:$(PRODUCT_OUT)/obj/lib_vendor/mt7601usta.ko @@ -1403,11 +1317,8 @@ PRODUCT_COPY_FILES += hardware/amlogic/wifi/mediatek/dhcpcd.conf:$(TARGET_COPY_O PRODUCT_PROPERTY_OVERRIDES += \ wifi.interface=wlan0 -ifneq ($(BOARD_USES_RECOVERY_AS_BOOT), true) -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:root/init.amlogic.wifi.rc -else -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:recovery/root/init.amlogic.wifi.rc -endif + +PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.wifi.rc endif ################################################################################## mt7603u @@ -1425,18 +1336,16 @@ BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_mtk BOARD_WLAN_DEVICE := mtk PRODUCT_COPY_FILES += hardware/amlogic/wifi/mediatek/iwpriv:$(TARGET_COPY_OUT_VENDOR)/bin/iwpriv PRODUCT_COPY_FILES += hardware/amlogic/wifi/mediatek/RT2870STA_7601.dat:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/RT2870STA_7603.dat -PRODUCT_COPY_FILES += hardware/amlogic/wifi/mediatek/init.mtk.rc:root/init.mtk.rc +PRODUCT_COPY_FILES += hardware/amlogic/wifi/mediatek/init.mtk.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.mtk.rc PRODUCT_COPY_FILES += hardware/amlogic/wifi/mediatek/wpa_supplicant.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant.conf PRODUCT_COPY_FILES += hardware/amlogic/wifi/mediatek/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf PRODUCT_COPY_FILES += hardware/amlogic/wifi/mediatek/mt7603usta.ko:$(PRODUCT_OUT)/obj/lib_vendor/mt7603usta.ko PRODUCT_COPY_FILES += hardware/amlogic/wifi/mediatek/mtprealloc.ko:$(PRODUCT_OUT)/obj/lib_vendor/mtprealloc.ko PRODUCT_COPY_FILES += hardware/amlogic/wifi/mediatek/dhcpcd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/dhcpcd/dhcpcd.conf PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.wifi.direct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.direct.xml -ifneq ($(BOARD_USES_RECOVERY_AS_BOOT), true) -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:root/init.amlogic.wifi.rc -else -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:recovery/root/init.amlogic.wifi.rc -endif + +PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.wifi.rc + PRODUCT_PROPERTY_OVERRIDES += \ wifi.interface=wlan0 @@ -1463,11 +1372,8 @@ endif PRODUCT_COPY_FILES += hardware/amlogic/wifi/mt5931/WIFI_RAM_CODE:$(TARGET_COPY_OUT_VENDOR)/etc/firmware/WIFI_RAM_CODE PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.wifi.direct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.direct.xml -ifneq ($(BOARD_USES_RECOVERY_AS_BOOT), true) -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:root/init.amlogic.wifi.rc -else -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:recovery/root/init.amlogic.wifi.rc -endif + +PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.wifi.rc PRODUCT_PROPERTY_OVERRIDES += \ wifi.interface=wlan0 @@ -1502,11 +1408,8 @@ PRODUCT_COPY_FILES += \ hardware/amlogic/wifi/qcom/config/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.wifi.direct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.direct.xml -ifneq ($(BOARD_USES_RECOVERY_AS_BOOT), true) -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:root/init.amlogic.wifi.rc -else -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:recovery/root/init.amlogic.wifi.rc -endif + +PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.wifi.rc PRODUCT_COPY_FILES += \ @@ -1545,7 +1448,7 @@ BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_qcom PRODUCT_COPY_FILES += hardware/amlogic/wifi/qcom/config/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf PRODUCT_COPY_FILES += hardware/amlogic/wifi/qcom/config/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.wifi.direct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.direct.xml -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:root/init.amlogic.wifi.rc +PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_rtk.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.wifi.rc PRODUCT_COPY_FILES += \ hardware/amlogic/wifi/qcom/config/qca6174/wifi/bdwlan30.bin:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/qca6174/bdwlan30.bin \ @@ -1669,7 +1572,7 @@ PRODUCT_COPY_FILES += hardware/amlogic/wifi/bcm_ampak/config/4358/nvram_4358.txt PRODUCT_COPY_FILES += hardware/amlogic/wifi/bcm_ampak/config/4358/config.txt:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/4358/config.txt PRODUCT_COPY_FILES += hardware/amlogic/wifi/bcm_ampak/config/AP62x8/fw_bcm4358u_ag.bin:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/43569/fw_bcm43569a2_ag.bin.trx PRODUCT_COPY_FILES += hardware/amlogic/wifi/bcm_ampak/config/AP62x8/nvram_ap62x8m.nvm:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/43569/nvram_ap6269a2.nvm -PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi.rc:root/init.amlogic.wifi.rc +PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.wifi.rc PRODUCT_COPY_FILES += hardware/amlogic/wifi/multi_wifi/config/bcm_supplicant.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/bcm_supplicant.conf PRODUCT_COPY_FILES += hardware/amlogic/wifi/multi_wifi/config/bcm_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/bcm_supplicant_overlay.conf PRODUCT_COPY_FILES += hardware/amlogic/wifi/multi_wifi/config/wpa_supplicant.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant.conf |