commit 80ba4a3fb986b9b536c9118aeb59741f7e206110
author Ying Wang <wangying@google.com> Tue Jul 21 21:00:55 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jul 21 21:00:55 2015 +0000
tree 06e8c7b7ae4de06d03dc5971c07114ceea73d417
parent e9b4605a9a42ce30857a1389463a81a99b0dd688
parent c671a7cf5cae42b61991d9b72e53d9d8a6ace84e

am c671a7cf: Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]

* commit 'c671a7cf5cae42b61991d9b72e53d9d8a6ace84e':
  Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]

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 \