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/factory.mk b/factory.mk
index e8e8f80..9115092 100644
--- a/factory.mk
+++ b/factory.mk
@@ -297,7 +297,21 @@ endif
aml_fastboot_zip:$(INSTALLED_AML_FASTBOOT_ZIP)
$(INSTALLED_AML_FASTBOOT_ZIP): $(addprefix $(PRODUCT_OUT)/,$(FASTBOOT_IMAGES))
echo "install $@"
- cd $(PRODUCT_OUT); zip -r $(TARGET_PRODUCT)-fastboot-$(BUILD_NUMBER).zip $(FASTBOOT_IMAGES)
+ mkdir -p $(PRODUCT_OUT)/fastboot
+ cd $(PRODUCT_OUT); cp $(FASTBOOT_IMAGES) fastboot/;
+ifeq ($(TARGET_PRODUCT),ampere)
+ echo "board=p212" > $(PRODUCT_OUT)/fastboot/android-info.txt
+endif
+ifeq ($(TARGET_PRODUCT),braun)
+ echo "board=p230" > $(PRODUCT_OUT)/fastboot/android-info.txt
+endif
+ifeq ($(TARGET_PRODUCT),curie)
+ echo "board=p241" > $(PRODUCT_OUT)/fastboot/android-info.txt
+endif
+ifeq ($(TARGET_PRODUCT),darwin)
+ echo "board=txlx_t962e_r321" > $(PRODUCT_OUT)/fastboot/android-info.txt
+endif
+ cd $(PRODUCT_OUT)/fastboot; zip -r ../$(TARGET_PRODUCT)-fastboot-$(BUILD_NUMBER).zip $(FASTBOOT_IMAGES)
droidcore: $(INSTALLED_AML_UPGRADE_PACKAGE_TARGET) $(INSTALLED_MANIFEST_XML) $(INSTALLED_AML_FASTBOOT_ZIP)
otapackage: $(INSTALLED_AML_UPGRADE_PACKAGE_TARGET) $(INSTALLED_MANIFEST_XML) $(INSTALLED_AML_FASTBOOT_ZIP)