commit 6f4f2a77939e8de843a9eb70e92e32c8054d74d5
author Yohann Roussel <yroussel@google.com> Thu Apr 14 21:14:38 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 14 21:14:38 2016 +0000
tree 9c3f9809980875abab4df50f272600d7d4f334fb
parent 98f7a5c7446ceae437642934f3e49c870deb8066
parent 109141ccc97d27cfc72affe3c45f3e6c2fb89702

Merge "Allow to force min sdk given to Jack"

core/clear_vars.mk

diff --git a/core/clear_vars.mk b/core/clear_vars.mk
index ade7d59..c3d390f 100644
--- a/core/clear_vars.mk
+++ b/core/clear_vars.mk
@@ -115,6 +115,7 @@
 LOCAL_JACK_COVERAGE_EXCLUDE_FILTER:=
 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 a070d20..6ee983e 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -51,6 +51,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)