Merge "Skip verifying the partition with no changed blocks." into nyc-dev
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:=
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)
diff --git a/target/product/base.mk b/target/product/base.mk
index 89166fa..d0d65e2 100644
--- a/target/product/base.mk
+++ b/target/product/base.mk
@@ -128,12 +128,6 @@
vold \
wm
-# TODO: Remove after N. Set WifiHAL to only log debug by default.
-# This is not the proper way to really fix this, but it is the best thing to
-# do in the time period we have for N. In the future they will be moving
-# more to a dumpsys style approach.
-PRODUCT_PROPERTY_OVERRIDES += \
- persist.log.tag.WifiHAL=I
PRODUCT_COPY_FILES := $(call add-to-product-copy-files-if-exists,\
frameworks/base/preloaded-classes:system/etc/preloaded-classes)