commit e9b4605a9a42ce30857a1389463a81a99b0dd688
author Ying Wang <wangying@google.com> Thu Jul 16 22:18:19 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jul 16 22:18:19 2015 +0000
tree 50db68b1ce851d5a896fb5a5ae371c67e317341c
parent e421b10f1c50aa11bd4ca299537c16bac0263da8
parent 7ac6cb804083a67d31a16b910dabfb76b30150a3

am 7ac6cb80: Add LOCAL_NO_LIBGCC.

* commit '7ac6cb804083a67d31a16b910dabfb76b30150a3':
  Add LOCAL_NO_LIBGCC.

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 \