commit 1d7e0f2c74c62bd047a5d41d28f2408500c7fa2c
author Yohann Roussel <yroussel@google.com> Wed Aug 24 09:50:29 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Aug 24 09:50:29 2016 +0000
tree 0bd0ec4a854cb0965e668eb7acbde9cd333dccfb
parent 14aa63a52a3e05079b85c409ec1c1c98f0781458
parent 624619d4d0b72678820e4cb6a89de5c5cce6bf5f

Merge "Allow selection of prebuilts min sdk"
am: 624619d4d0

Change-Id: I54df2acb3003c0222b3f3d909d3f9c80dfda493d

core/prebuilt_internal.mk

diff --git a/core/prebuilt_internal.mk b/core/prebuilt_internal.mk
index 18277f9..ea4e66b 100644
--- a/core/prebuilt_internal.mk
+++ b/core/prebuilt_internal.mk
@@ -461,7 +461,7 @@
 
 # We may be building classes.jack from a host jar for host dalvik Java library.
 $(intermediates.COMMON)/classes.jack : PRIVATE_JACK_FLAGS:=$(LOCAL_JACK_FLAGS)
-$(intermediates.COMMON)/classes.jack : PRIVATE_JACK_MIN_SDK_VERSION := 1
+$(intermediates.COMMON)/classes.jack : PRIVATE_JACK_MIN_SDK_VERSION := $(if $(strip $(LOCAL_MIN_SDK_VERSION)),$(LOCAL_MIN_SDK_VERSION),1)
 $(intermediates.COMMON)/classes.jack : $(my_src_jar) \
         $(LOCAL_ADDITIONAL_DEPENDENCIES) $(JACK_DEFAULT_ARGS) $(JACK) \
         | setup-jack-server