commit 624619d4d0b72678820e4cb6a89de5c5cce6bf5f
author Yohann Roussel <yroussel@google.com> Wed Aug 24 09:39:30 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Aug 24 09:39:30 2016 +0000
tree 1da253040dee0973988b998a9bc54f32127ea766
parent aba93cf736b927dc5312f233535360fcc92603e2
parent 5960c546648e8fc058530c6bc39804b225d9ce11

Merge "Allow selection of prebuilts min sdk"

core/prebuilt_internal.mk

diff --git a/core/prebuilt_internal.mk b/core/prebuilt_internal.mk
index 701414a..76a05bf 100644
--- a/core/prebuilt_internal.mk
+++ b/core/prebuilt_internal.mk
@@ -428,7 +428,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