ampere: set BOARD_AML_VENDOR_PATH [3/24]

PD# 157360

set BOARD_AML_VENDOR_PATH

Change-Id: I046f7ed1867ba87b6143b3f3c89f281ba2b6ef75

5 files changed, 47 insertions, 27 deletions

diff --git a/Kernel.mk b/Kernel.mk
index 5dc86c7..ecdfd9b 100644
--- a/Kernel.mk
+++ b/Kernel.mk
@@ -1,15 +1,9 @@
 #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)
@@ -27,9 +21,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/ampere-kernel/lib/mali.ko $(PRODUCT_OUT)/vendor/lib/
 	cp device/amlogic/ampere-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/
 
@@ -43,11 +39,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 := gxl_p212_1g gxl_p212_2g
 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/ampere.mk b/ampere.mk
index 37e92a3..0a70837 100644
--- a/ampere.mk
+++ b/ampere.mk
@@ -55,6 +55,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 ba9d63f..d6b0126 100644
--- a/device.mk
+++ b/device.mk
@@ -14,20 +14,17 @@
 # limitations under the License.
 #
 
-ifneq ($(BOARD_USES_RECOVERY_AS_BOOT), true)
-PRODUCT_COPY_FILES += device/amlogic/common/products/mbox/init.amlogic.rc:root/init.amlogic.rc
+PRODUCT_COPY_FILES += \
+    device/amlogic/common/products/mbox/init.amlogic.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.rc \
+    device/amlogic/ampere/init.amlogic.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.usb.rc \
+    device/amlogic/ampere/init.amlogic.board.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.board.rc
 
+ifneq ($(BOARD_USES_RECOVERY_AS_BOOT), true)
 PRODUCT_COPY_FILES += \
-    device/amlogic/ampere/init.amlogic.usb.rc:root/init.amlogic.usb.rc \
-    device/amlogic/common/products/mbox/ueventd.amlogic.rc:root/ueventd.amlogic.rc \
-    device/amlogic/ampere/init.amlogic.board.rc:root/init.amlogic.board.rc
+    device/amlogic/common/products/mbox/ueventd.amlogic.rc:root/ueventd.amlogic.rc
 else
-PRODUCT_COPY_FILES += device/amlogic/common/products/mbox/init.amlogic.rc:recovery/root/init.amlogic.rc
-
 PRODUCT_COPY_FILES += \
-    device/amlogic/ampere/init.amlogic.usb.$(BOARD_KERNEL_VERSION).rc:recovery/root/init.amlogic.usb.rc \
-    device/amlogic/common/products/mbox/ueventd.amlogic.rc:recovery/root/ueventd.amlogic.rc \
-    device/amlogic/ampere/init.amlogic.board.rc:recovery/root/init.amlogic.board.rc
+    device/amlogic/common/products/mbox/ueventd.amlogic.rc:recovery/root/ueventd.amlogic.rc
 endif
 
 PRODUCT_COPY_FILES += \
diff --git a/files/media_codecs.xml b/files/media_codecs.xml
index c50dedd..18adfa8 100644
--- a/files/media_codecs.xml
+++ b/files/media_codecs.xml
@@ -207,15 +207,25 @@ Only the three quirks included above are recognized at this point:
             <Feature name="tunneled-playback" />
 	    <Limit name="concurrent-instances" max="1" />
         </MediaCodec>
-	<MediaCodec name="OMX.google.vp6.decoder.sw" type="video/x-vnd.on2.vp6" />
-        <MediaCodec name="OMX.google.vp6a.decoder.sw" type="video/x-vnd.on2.vp6a" />
-        <MediaCodec name="OMX.google.vp6f.decoder.sw" type="video/x-vnd.on2.vp6f" />
-        <MediaCodec name="OMX.google.rm10.decoder.sw" type="video/rm10" />
-        <MediaCodec name="OMX.google.rm20.decoder.sw" type="video/rm20" />
-        <MediaCodec name="OMX.google.rm40.decoder.sw" type="video/rm40" />
-        <MediaCodec name="OMX.google.wmv2.decoder.sw" type="video/wmv2" />
-        <MediaCodec name="OMX.google.wmv1.decoder.sw" type="video/wmv1" />
-	<MediaCodec name="OMX.google.vp8.decoder" type="video/x-vnd.on2.vp8">
+	<MediaCodec name="OMX.amlogic.avs.decoder.awesome" type="video/avs" >
+            <Limit name="size" min="64x64" max="1920x1088" />
+            <Limit name="alignment" value="2x2" />
+            <Limit name="block-size" value="16x16" />
+            <Limit name="blocks-per-second" min="1" max="972000" />
+            <Limit name="bitrate" range="1-300000000" />
+            <Feature name="adaptive-playback" />
+            <Limit name="concurrent-instances" max="1" />
+        </MediaCodec>
+	<MediaCodec name="OMX.amlogic.vp6.decoder.sw" type="video/x-vnd.on2.vp6" />
+        <MediaCodec name="OMX.amlogic.vp6a.decoder.sw" type="video/x-vnd.on2.vp6a" />
+        <MediaCodec name="OMX.amlogic.vp6f.decoder.sw" type="video/x-vnd.on2.vp6f" />
+        <MediaCodec name="OMX.amlogic.rm10.decoder.sw" type="video/rm10" />
+        <MediaCodec name="OMX.amlogic.rm20.decoder.sw" type="video/rm20" />
+        <MediaCodec name="OMX.amlogic.rm30.decoder.sw" type="video/rm30" />
+        <MediaCodec name="OMX.amlogic.rm40.decoder.sw" type="video/rm40" />
+        <MediaCodec name="OMX.amlogic.wmv2.decoder.sw" type="video/wmv2" />
+        <MediaCodec name="OMX.amlogic.wmv1.decoder.sw" type="video/wmv1" />
+	<MediaCodec name="OMX.amlogic.vp8.decoder.sw" type="video/x-vnd.on2.vp8">
             <Limit name="size" min="2x2" max="2048x2048" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
@@ -265,6 +275,15 @@ Only the three quirks included above are recognized at this point:
             <Limit name="bitrate" range="1-40000000" />
             <Feature name="adaptive-playback" />
         </MediaCodec>
+	<MediaCodec name="OMX.google.vp8.decoder" type="video/x-vnd.on2.vp8">
+            <Limit name="size" min="2x2" max="2048x2048" />
+            <Limit name="alignment" value="2x2" />
+            <Limit name="block-size" value="16x16" />
+            <Limit name="block-count" range="1-8160" />
+            <Limit name="blocks-per-second" range="1-500000" />
+            <Limit name="bitrate" range="1-40000000" />
+            <Feature name="adaptive-playback" />
+        </MediaCodec>
         <MediaCodec name="OMX.google.vp9.decoder" type="video/x-vnd.on2.vp9">
             <Limit name="size" min="2x2" max="1280x1280" />
             <Limit name="alignment" value="2x2" />
diff --git a/init.amlogic.board.rc b/init.amlogic.board.rc
index c6e6623..814d112 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