Merge "Allow selection of prebuilts min sdk"
This commit is contained in:
@@ -428,7 +428,7 @@ ifneq ($(prebuilt_module_is_dex_javalib),true)
|
|||||||
|
|
||||||
# We may be building classes.jack from a host jar for host dalvik Java library.
|
# 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_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) \
|
$(intermediates.COMMON)/classes.jack : $(my_src_jar) \
|
||||||
$(LOCAL_ADDITIONAL_DEPENDENCIES) $(JACK_DEFAULT_ARGS) $(JACK) \
|
$(LOCAL_ADDITIONAL_DEPENDENCIES) $(JACK_DEFAULT_ARGS) $(JACK) \
|
||||||
| setup-jack-server
|
| setup-jack-server
|
||||||
|
Reference in New Issue
Block a user