darwin: set BOARD_AML_VENDOR_PATH [6/24]

PD# 157360

set BOARD_AML_VENDOR_PATH

Change-Id: Ia3b765f4db34b8206a6760db072f39618e9296d3

4 files changed, 20 insertions, 19 deletions

diff --git a/Kernel.mk b/Kernel.mk
index e73070a..a1a7f40 100644
--- a/Kernel.mk
+++ b/Kernel.mk
@@ -1,15 +1,10 @@
 #if use probuilt kernel or build kernel from source code
--include device/amlogic/common/gpu.mk
--include device/amlogic/common/media_modules.mk
--include device/amlogic/common/wifi_modules.mk
 
 KERNEL_ROOTDIR := common
 KERNEL_KO_OUT := $(PRODUCT_OUT)/obj/lib_vendor
 
 TARGET_KERNEL_BUILT_FROM_SOURCE := false
 
-WIFI_MODULE := multiwifi
-
 INSTALLED_KERNEL_TARGET := $(PRODUCT_OUT)/kernel
 
 BOARD_MKBOOTIMG_ARGS := --second $(PRODUCT_OUT)/dtb.img --kernel_offset $(BOARD_KERNEL_OFFSET)
@@ -23,9 +18,11 @@ $(TARGET_PREBUILT_KERNEL): $(INSTALLED_BOARDDTB_TARGET)
 	@echo "cp kernel modules"
 	mkdir -p $(PRODUCT_OUT)/root/boot
 	mkdir -p $(PRODUCT_OUT)/vendor/lib
+	mkdir -p $(PRODUCT_OUT)/obj/lib
 	mkdir -p $(KERNEL_KO_OUT)
 	cp device/amlogic/darwin-kernel/lib/mali.ko $(PRODUCT_OUT)/vendor/lib/
 	cp device/amlogic/darwin-kernel/lib/modules/* $(KERNEL_KO_OUT)/
+	cp device/amlogic/ampere-kernel/tdk/* $(PRODUCT_OUT)/obj/lib/
 	mkdir -p $(PRODUCT_OUT)/$(TARGET_COPY_OUT_VENDOR)/lib/modules/
 	cp $(KERNEL_KO_OUT)/* $(PRODUCT_OUT)/$(TARGET_COPY_OUT_VENDOR)/lib/modules/
 
@@ -39,11 +36,15 @@ $(INSTALLED_BOARDDTB_TARGET): $(LOCAL_DTB) | $(ACP)
 
 else
 
+-include device/amlogic/common/gpu.mk
+-include device/amlogic/common/media_modules.mk
+-include device/amlogic/common/wifi_modules.mk
+
 KERNEL_DEVICETREE := txlx_t962e_r321
 KERNEL_DEFCONFIG := meson64_defconfig
 KERNEL_ARCH := arm64
 
-
+WIFI_MODULE := multiwifi
 
 KERNEL_OUT := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ
 KERNEL_CONFIG := $(KERNEL_OUT)/.config
diff --git a/darwin.mk b/darwin.mk
index a5b4f24..a231171 100644
--- a/darwin.mk
+++ b/darwin.mk
@@ -56,6 +56,10 @@ WITH_LIBPLAYER_MODULE := false
 
 OTA_UP_PART_NUM_CHANGED := true
 
+BOARD_AML_VENDOR_PATH := vendor/amlogic/ampere/
+
+BOARD_WIDEVINE_PATH := vendor/amlogic/ampere/
+
 #AB_OTA_UPDATER :=true
 
 ifeq ($(AB_OTA_UPDATER),true)
diff --git a/device.mk b/device.mk
index 3e87fe5..560732d 100644
--- a/device.mk
+++ b/device.mk
@@ -14,21 +14,17 @@
 # limitations under the License.
 #
 
-ifneq ($(BOARD_USES_RECOVERY_AS_BOOT), true)
-PRODUCT_COPY_FILES += device/amlogic/common/products/tv/init.amlogic.rc:root/init.amlogic.rc
-
 PRODUCT_COPY_FILES += \
-    device/amlogic/darwin/init.amlogic.usb.rc:root/init.amlogic.usb.rc \
-    device/amlogic/common/products/tv/ueventd.amlogic.rc:root/ueventd.amlogic.rc \
-    device/amlogic/darwin/init.amlogic.board.rc:root/init.amlogic.board.rc
-else
-PRODUCT_COPY_FILES += device/amlogic/common/products/tv/init.amlogic.rc:recovery/root/init.amlogic.rc
+    device/amlogic/common/products/tv/init.amlogic.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.rc \
+    device/amlogic/darwin/init.amlogic.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.usb.rc \
+    device/amlogic/darwin/init.amlogic.board.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.board.rc
 
-PRODUCT_COPY_FILES += \
-    device/amlogic/darwin/init.amlogic.usb.$(BOARD_KERNEL_VERSION).rc:recovery/root/init.amlogic.usb.rc \
-    device/amlogic/common/products/tv/ueventd.amlogic.rc:recovery/root/ueventd.amlogic.rc \
-    device/amlogic/darwin/init.amlogic.board.rc:recovery/root/init.amlogic.board.rc
+ifneq ($(BOARD_USES_RECOVERY_AS_BOOT), true)
+PRODUCT_COPY_FILES += device/amlogic/common/products/tv/ueventd.amlogic.rc:root/ueventd.amlogic.rc
+else
+PRODUCT_COPY_FILES += device/amlogic/common/products/tv/ueventd.amlogic.rc:recovery/root/ueventd.amlogic.rc
 endif
+
 PRODUCT_COPY_FILES += \
     device/amlogic/darwin/files/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles.xml \
     device/amlogic/darwin/files/media_profiles_V1_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml \
diff --git a/init.amlogic.board.rc b/init.amlogic.board.rc
index 5ce5293..52b17b7 100644
--- a/init.amlogic.board.rc
+++ b/init.amlogic.board.rc
@@ -1,4 +1,4 @@
-import init.amlogic.usb.rc
+import /vendor/etc/init/hw/init.amlogic.usb.rc
 
 on early-init
     loglevel 3