summaryrefslogtreecommitdiff
Diffstat
-rw-r--r--core_amlogic.mk49
-rw-r--r--factory.mk16
-rw-r--r--products/mbox/init.amlogic.rc2
-rw-r--r--products/mbox/upgrade_4.9/aml_upgrade_package_AB.conf1
-rw-r--r--products/mbox/upgrade_4.9/aml_upgrade_package_AB_enc.conf6
-rw-r--r--products/tv/init.amlogic.rc2
-rw-r--r--recovery/check/Android.mk4
-rw-r--r--recovery/recovery_extra/Android.mk4
-rw-r--r--recovery/ui/Android.mk4
-rw-r--r--recovery/updater_extra/Android.mk4
-rw-r--r--sepolicy/e2fs.te7
-rw-r--r--sepolicy/file.te2
-rw-r--r--sepolicy/file_contexts4
-rw-r--r--sepolicy/hal_cas_default.te2
-rw-r--r--sepolicy/hal_memtrack_default.te11
-rw-r--r--sepolicy/logd.te1
-rw-r--r--sepolicy/mediaprovider.te1
-rw-r--r--sepolicy/recovery.te16
-rw-r--r--sepolicy/system_app.te12
-rw-r--r--sepolicy/system_server.te4
-rw-r--r--sepolicy/untrusted_app.te1
-rw-r--r--sepolicy/untrusted_app_25.te1
-rw-r--r--sepolicy/zygote.te2
-rw-r--r--vendor-overlay/Android.mk18
-rw-r--r--vendor-overlay/AndroidManifest.xml6
-rw-r--r--vendor-overlay/res/values/config.xml5
-rw-r--r--vndk/Android.mk50
-rw-r--r--wifi.mk8
28 files changed, 171 insertions, 72 deletions
diff --git a/products/mbox/upgrade_4.9/aml_upgrade_package_AB_enc.conf b/products/mbox/upgrade_4.9/aml_upgrade_package_AB_enc.conf
index 1b1d9a0..59c1c2e 100644
--- a/products/mbox/upgrade_4.9/aml_upgrade_package_AB_enc.conf
+++ b/products/mbox/upgrade_4.9/aml_upgrade_package_AB_enc.conf
@@ -21,11 +21,11 @@ file="manifest.xml" main_type="xml" sub_type="man
#file="userdata.img" main_type="PARTITION" sub_type="data"
file="logo.img" main_type="PARTITION" sub_type="logo"
-file="boot.img.encrypt" main_type="PARTITION" sub_type="boot"
file="boot.img.encrypt" main_type="PARTITION" sub_type="boot_a"
-#file="boot.img.encrypt" main_type="PARTITION" sub_type="boot_b"
file="system.img" main_type="PARTITION" sub_type="system_a"
-#file="system.img" main_type="PARTITION" sub_type="system_b"
+file="vendor.img" main_type="PARTITION" sub_type="vendor_a"
+file="odm.img" main_type="PARTITION" sub_type="odm_a"
+file="odm.img" main_type="PARTITION" sub_type="odm_b"
file="u-boot.bin.encrypt" main_type="PARTITION" sub_type="bootloader"
file="dtb.img.encrypt" main_type="PARTITION" sub_type="_aml_dtb"