Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51403950 authored by Yohann Roussel's avatar Yohann Roussel Committed by android-build-merger
Browse files

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

am: 1d7e0f2c

Change-Id: I54d5035cecbfa6785a68c9d454ffb27a5e8346cd
parents 75db430a 1d7e0f2c

core/prebuilt_internal.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -461,7 +461,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