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/recovery/updater_extra/Android.mk b/recovery/updater_extra/Android.mk
index 80130e0..589ffe5 100644
--- a/recovery/updater_extra/Android.mk
+++ b/recovery/updater_extra/Android.mk
@@ -10,7 +10,9 @@ LOCAL_MODULE_TAGS := eng
LOCAL_C_INCLUDES += bootable/recovery
-LOCAL_C_INCLUDES += bootable/recovery/updater/include
+LOCAL_C_INCLUDES += \
+ bootable/recovery/updater/include \
+ system/core/libziparchive/include
LOCAL_C_INCLUDES += $(LOCAL_PATH)/../