Merge "Allow selection of prebuilts min sdk" am: 624619d4d0 am: 1d7e0f2c74 am: 51403950b3

am: 760ece009b

Change-Id: I74a694593cc3937a919346c4dc0923883c85beea
This commit is contained in:
Yohann Roussel 2016-08-24 10:04:44 +00:00 committed by android-build-merger
commit 4253f35dbb

View file

@ -481,7 +481,7 @@ ifneq ($(prebuilt_module_is_dex_javalib),true)
# 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