commit 16d0b4cff1b643ee6bb70a3cf4541f34c4bc2210
author Ying Wang <wangying@google.com> Mon Aug 03 21:20:54 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Aug 03 21:20:54 2015 +0000
tree bc5490f54bc0660041ae59155620af29777762bb
parent 4b4244cb03bb6f5339859c4631717fe0ddeec4e8
parent 66c8e8c756fb1790cac792b32ba2de057c3b1b4e

am 66c8e8c7: Don\'t prepend CC_WRAPPER to CLANG.

* commit '66c8e8c756fb1790cac792b32ba2de057c3b1b4e':
  Don't prepend CC_WRAPPER to CLANG.

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 \