commit b55f57192707aab7e193798ac4d3158338ef6395
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Apr 15 00:33:43 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 15 00:33:43 2016 +0000
tree c5e58c6336e491fab070dbdb6c9a13a74bb1b905
parent ad84f802fcb471f5d8855b8c142dc987522b98b1
parent 9d14641a190d76dfcd6e6e42a0810d2b734343e1

Merge "Revert "Set WifiHAL to only log debug by default."" into nyc-dev

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 1257e15..7950501 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1487,6 +1487,10 @@
   $(HOST_OUT_JAVA_LIBRARIES)/BootSignature.jar \
   $(HOST_OUT_EXECUTABLES)/mkuserimg.sh \
   $(HOST_OUT_EXECUTABLES)/make_ext4fs \
+  $(HOST_OUT_EXECUTABLES)/mksquashfsimage.sh \
+  $(HOST_OUT_EXECUTABLES)/mksquashfs \
+  $(HOST_OUT_EXECUTABLES)/mkf2fsuserimg.sh \
+  $(HOST_OUT_EXECUTABLES)/make_f2fs \
   $(HOST_OUT_EXECUTABLES)/simg2img \
   $(HOST_OUT_EXECUTABLES)/e2fsck \
   $(HOST_OUT_EXECUTABLES)/build_verity_tree \

core/clear_vars.mk

diff --git a/core/clear_vars.mk b/core/clear_vars.mk
index 9c2fa1d..7473a73 100644
--- a/core/clear_vars.mk
+++ b/core/clear_vars.mk
@@ -116,6 +116,7 @@
 LOCAL_JILL_FLAGS:=
 LOCAL_CERTIFICATE:=
 LOCAL_SDK_VERSION:=
+LOCAL_MIN_SDK_VERSION:=
 LOCAL_SDK_RES_VERSION:=
 LOCAL_NDK_STL_VARIANT:=
 LOCAL_EMMA_INSTRUMENT:=

core/java.mk

diff --git a/core/java.mk b/core/java.mk
index 2caf511..f4899a4 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -55,6 +55,10 @@
   endif
 endif
 
+ifneq (,$(strip $(LOCAL_MIN_SDK_VERSION)))
+  my_jack_min_sdk_version := $(LOCAL_MIN_SDK_VERSION)
+endif
+
 proto_sources := $(filter %.proto,$(LOCAL_SRC_FILES))
 ifneq ($(proto_sources),)
 ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),micro)