commit 8d7066c148cb1a2ed3c1b3f41cafda36a4efe2d2
author Thierry Strudel <tstrudel@google.com> Mon Jul 13 23:31:15 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Jul 13 23:31:15 2015 +0000
tree 48da72b13ad92a15198354d7805f092830a075fd
parent 701981851110d6931195a5898c521bf8cdab2bae
parent 6b74f21a4d3ff7ed7bb8463210263e9ecb27830a

am 6b74f21a: oem_image/custom_image: fix missing new parameter to build_image.py

* commit '6b74f21a4d3ff7ed7bb8463210263e9ecb27830a':
  oem_image/custom_image: fix missing new parameter to build_image.py

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 7da3b23..c98df0c 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1507,7 +1507,7 @@
 	$(hide) echo "use_set_metadata=1" >> $(zip_root)/META/misc_info.txt
 	$(hide) echo "multistage_support=1" >> $(zip_root)/META/misc_info.txt
 	$(hide) echo "update_rename_support=1" >> $(zip_root)/META/misc_info.txt
-	$(hide) echo "blockimgdiff_versions=1,2,3" >> $(zip_root)/META/misc_info.txt
+	$(hide) echo "blockimgdiff_versions=1,2" >> $(zip_root)/META/misc_info.txt
 ifneq ($(OEM_THUMBPRINT_PROPERTIES),)
 	# OTA scripts are only interested in fingerprint related properties
 	$(hide) echo "oem_fingerprint_properties=$(OEM_THUMBPRINT_PROPERTIES)" >> $(zip_root)/META/misc_info.txt

target/product/base.mk

diff --git a/target/product/base.mk b/target/product/base.mk
index 1699156..4c49e86 100644
--- a/target/product/base.mk
+++ b/target/product/base.mk
@@ -111,6 +111,7 @@
     run-as \
     schedtest \
     sdcard \
+    secdiscard \
     services \
     settings \
     sgdisk \