From: Yohann Roussel <yroussel@google.com>
Date: Thu, 14 Apr 2016 19:51:46 +0000 (+0200)
Subject: Allow to force min sdk given to Jack
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=109141ccc97d27cfc72affe3c45f3e6c2fb89702;p=android-x86%2Fbuild.git

Allow to force min sdk given to Jack

Allows setting the min sdk version for target Jack commands,
overriding the default value obtained from LOCAL_SDK_CURRENT.

Bug: 28188420
Change-Id: I1b84ad8a7b6ae30639f8ade455c1e542af5692e4
---

diff --git a/core/clear_vars.mk b/core/clear_vars.mk
index 7304bf8d7..7ee7ab3b0 100644
--- a/core/clear_vars.mk
+++ b/core/clear_vars.mk
@@ -112,6 +112,7 @@ LOCAL_JACK_FLAGS:=
 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 5ac934280..3f1966df2 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -51,6 +51,10 @@ else
   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)