From 6cf511230ef5b15c7d61896f16d251739fac3e07 Mon Sep 17 00:00:00 2001 From: Xindong Xu Date: Fri, 22 Dec 2017 02:39:38 +0000 Subject: ref_dev_common: change all vendor/amlogic to BOARD_AML_VENDOR_PATH [5/24] PD# 157360 change all vendor/amlogic to BOARD_AML_VENDOR_PATH Change-Id: Ieb15bc85b482c4e767fe18c7d10966bdf523d997 --- diff --git a/core_amlogic.mk b/core_amlogic.mk index 8c6c006..313fe4b 100644 --- a/core_amlogic.mk +++ b/core_amlogic.mk @@ -128,7 +128,7 @@ $(call inherit-product, build/target/product/core_base.mk) #default hardware composer version is 2.0 TARGET_USES_HWC2 := true -ifneq ($(wildcard vendor/amlogic/frameworks/av/LibPlayer),) +ifneq ($(wildcard $(BOARD_AML_VENDOR_PATH)/frameworks/av/LibPlayer),) WITH_LIBPLAYER_MODULE := true else WITH_LIBPLAYER_MODULE := false @@ -291,9 +291,13 @@ PRODUCT_COPY_FILES += \ # ######################################################################### ifeq ($(TARGET_USE_OPTEEOS),true) +ifeq ($(TARGET_KERNEL_BUILT_FROM_SOURCE), true) PRODUCT_PACKAGES += \ optee_armtz \ - optee \ + optee +endif + +PRODUCT_PACKAGES += \ tee-supplicant \ libteec \ tee_helloworld \ diff --git a/factory.mk b/factory.mk index b9b09d9..16ea378 100644 --- a/factory.mk +++ b/factory.mk @@ -1,6 +1,6 @@ IMGPACK := $(BUILD_OUT_EXECUTABLES)/logo_img_packer$(BUILD_EXECUTABLE_SUFFIX) PRODUCT_UPGRADE_OUT := $(PRODUCT_OUT)/upgrade -AML_EMMC_BIN_GENERATOR := vendor/amlogic/tools/aml_upgrade/amlogic_emmc_bin_maker.sh +AML_EMMC_BIN_GENERATOR := $(BOARD_AML_VENDOR_PATH)/tools/aml_upgrade/amlogic_emmc_bin_maker.sh PRODUCT_COMMON_DIR := device/amlogic/common/products/$(PRODUCT_TYPE) ifeq ($(TARGET_NO_RECOVERY),true) @@ -53,7 +53,7 @@ $(call dist-for-goals, odm_image, $(INSTALLED_ODMIMAGE_TARGET)) endif ifdef KERNEL_DEVICETREE -DTBTOOL := vendor/amlogic/tools/dtbTool +DTBTOOL := $(BOARD_AML_VENDOR_PATH)/tools/dtbTool ifdef KERNEL_DEVICETREE_CUSTOMER_DIR KERNEL_DEVICETREE_DIR := $(KERNEL_DEVICETREE_CUSTOMER_DIR) @@ -266,9 +266,9 @@ endif# ifeq ($(PRODUCT_BUILD_SECURE_BOOT_IMAGE_DIRECTLY),true) $(hide) $(foreach userPartName, $(BOARD_USER_PARTS_NAME), \ $(call aml-user-img-update-pkg,$(userPartName),$(PACKAGE_CONFIG_FILE))) @echo "Package: $@" - @echo ./vendor/amlogic/tools/aml_upgrade/aml_image_v2_packer -r \ + @echo ./$(BOARD_AML_VENDOR_PATH)/tools/aml_upgrade/aml_image_v2_packer -r \ $(PACKAGE_CONFIG_FILE) $(PRODUCT_UPGRADE_OUT)/ $@ - ./vendor/amlogic/tools/aml_upgrade/aml_image_v2_packer -r \ + ./$(BOARD_AML_VENDOR_PATH)/tools/aml_upgrade/aml_image_v2_packer -r \ $(PACKAGE_CONFIG_FILE) $(PRODUCT_UPGRADE_OUT)/ $@ @echo " $@ installed" else diff --git a/init.amlogic.wifi.rc b/init.amlogic.wifi.rc index 6bc71d5..d214176 100644 --- a/init.amlogic.wifi.rc +++ b/init.amlogic.wifi.rc @@ -1,4 +1,4 @@ -import init.amlogic.usb.rc +import /vendor/etc/init/hw/init.amlogic.usb.rc on fs diff --git a/media.mk b/media.mk index e940cf9..66a2670 100644 --- a/media.mk +++ b/media.mk @@ -105,9 +105,9 @@ PRODUCT_PACKAGES += libplayreadymediadrmplugin \ 9a04f079-9840-4286-ab92e65be0885f95 PRODUCT_COPY_FILES += \ - vendor/playready/playreadyplugin/keycert/zgpriv.dat:$(TARGET_COPY_OUT_VENDOR)/etc/drm/playready/zgpriv.dat \ - vendor/playready/playreadyplugin/keycert/bgroupcert.dat:$(TARGET_COPY_OUT_VENDOR)/etc/drm/playready/bgroupcert.dat \ - vendor/playready/playreadyplugin/keycert/zgpriv_protected.dat:$(TARGET_COPY_OUT_VENDOR)/etc/drm/playready/zgpriv_protected.dat + $(BOARD_AML_VENDOR_PATH)/playready/playreadyplugin/keycert/zgpriv.dat:$(TARGET_COPY_OUT_VENDOR)/etc/drm/playready/zgpriv.dat \ + $(BOARD_AML_VENDOR_PATH)/playready/playreadyplugin/keycert/bgroupcert.dat:$(TARGET_COPY_OUT_VENDOR)/etc/drm/playready/bgroupcert.dat \ + $(BOARD_AML_VENDOR_PATH)/playready/playreadyplugin/keycert/zgpriv_protected.dat:$(TARGET_COPY_OUT_VENDOR)/etc/drm/playready/zgpriv_protected.dat endif @@ -283,11 +283,10 @@ PRODUCT_COPY_FILES += \ BOARD_AML_MEDIAHAL_PATH := hardware/amlogic/media/ BOARD_AML_LIBAUDIO_PATH := hardware/amlogic/LibAudio/ BOARD_AML_HARDWARE_PATH := hardware/amlogic/ -BOARD_AML_VENDOR_PATH := vendor/amlogic/ AMLOGIC_FRAMEWORKS_AV_CONFIG_MK := $(BOARD_AML_VENDOR_PATH)/frameworks/av/mediaextconfig/config.mk BOARD_AML_MEDIA_HAL_CONFIG := $(BOARD_AML_MEDIAHAL_PATH)/media_base_config.mk # for media modules PRODUCT_COPY_FILES += \ - device/amlogic/common/init.amlogic.media.rc:root/init.amlogic.media.rc + device/amlogic/common/init.amlogic.media.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.media.rc diff --git a/products/mbox/init.amlogic.rc b/products/mbox/init.amlogic.rc index f08daf6..d6b773d 100644 --- a/products/mbox/init.amlogic.rc +++ b/products/mbox/init.amlogic.rc @@ -1,8 +1,8 @@ -import init.amlogic.usb.rc -import init.amlogic.board.rc -import init.amlogic.wifi.rc -import init.amlogic.media.rc -import init.mtk.rc +import /vendor/etc/init/hw/init.amlogic.usb.rc +import /vendor/etc/init/hw/init.amlogic.board.rc +import /vendor/etc/init/hw/init.amlogic.wifi.rc +import /vendor/etc/init/hw/init.amlogic.media.rc +import /vendor/etc/init/hw/init.mtk.rc on early-init mount debugfs /sys/kernel/debug /sys/kernel/debug mode=755 diff --git a/products/tablet/init.amlogic.rc b/products/tablet/init.amlogic.rc index 67794b4..0832e35 100644 --- a/products/tablet/init.amlogic.rc +++ b/products/tablet/init.amlogic.rc @@ -1,8 +1,8 @@ -import init.amlogic.usb.rc -import init.amlogic.board.rc -import init.amlogic.wifi.rc -import init.amlogic.media.rc -import init.mtk.rc +import /vendor/etc/init/hw/init.amlogic.usb.rc +import /vendor/etc/init/hw/init.amlogic.board.rc +import /vendor/etc/init/hw/init.amlogic.wifi.rc +import /vendor/etc/init/hw/init.amlogic.media.rc +import /vendor/etc/init/hw/init.mtk.rc on early-init diff --git a/products/tv/init.amlogic.rc b/products/tv/init.amlogic.rc index bad2ea1..ad50075 100644 --- a/products/tv/init.amlogic.rc +++ b/products/tv/init.amlogic.rc @@ -1,8 +1,8 @@ -import init.amlogic.usb.rc -import init.amlogic.board.rc -import init.amlogic.wifi.rc -import init.amlogic.media.rc -import init.mtk.rc +import /vendor/etc/init/hw/init.amlogic.usb.rc +import /vendor/etc/init/hw/init.amlogic.board.rc +import /vendor/etc/init/hw/init.amlogic.wifi.rc +import /vendor/etc/init/hw/init.amlogic.media.rc +import /vendor/etc/init/hw/init.mtk.rc on early-init mount debugfs /sys/kernel/debug /sys/kernel/debug mode=755 diff --git a/recovery/ubootenv/Android.mk b/recovery/ubootenv/Android.mk index cccff88..8aedda6 100644 --- a/recovery/ubootenv/Android.mk +++ b/recovery/ubootenv/Android.mk @@ -7,7 +7,7 @@ LOCAL_MODULE := libenv LOCAL_MODULE_TAGS := eng -LOCAL_C_INCLUDES += vendor/amlogic/frameworks/services/systemcontrol +LOCAL_C_INCLUDES += $(BOARD_AML_VENDOR_PATH)/frameworks/services/systemcontrol LOCAL_C_INCLUDES += bootable/recovery LOCAL_FORCE_STATIC_EXECUTABLE := true diff --git a/software.mk b/software.mk index 920b28f..c8e6f96 100644 --- a/software.mk +++ b/software.mk @@ -67,9 +67,6 @@ endif ifeq ($(TARGET_BUILD_NETFLIX), true) PRODUCT_COPY_FILES += \ device/amlogic/common/droidlogic.software.netflix.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/droidlogic.software.netflix.xml - -PRODUCT_PROPERTY_OVERRIDES += \ - ro.nrdp.modelgroup=P212ATV endif $(call inherit-product-if-exists, external/hyphenation-patterns/patterns.mk) diff --git a/wifi.mk b/wifi.mk index 03ad5f2..4626e7a 100644 --- a/wifi.mk +++ b/wifi.mk @@ -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 -- cgit