summaryrefslogtreecommitdiff
Diffstat
-rw-r--r--core_amlogic.mk8
-rw-r--r--factory.mk8
-rw-r--r--init.amlogic.wifi.rc2
-rw-r--r--media.mk9
-rw-r--r--products/mbox/init.amlogic.rc10
-rw-r--r--products/tablet/init.amlogic.rc10
-rw-r--r--products/tv/init.amlogic.rc10
-rw-r--r--recovery/ubootenv/Android.mk2
-rw-r--r--software.mk3
-rw-r--r--wifi.mk265
10 files changed, 115 insertions, 212 deletions
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