StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Respect LOCAL_MIN_SDK_VERSION for dx"

Browse Source
This commit is contained in:
Treehugger Robot
2017-09-29 20:13:08 +00:00
committed by Gerrit Code Review
parent 4655de40c1 9deb331f20
commit a426e0e974
3 changed files with 37 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/definitions.mk
View File

@@ -2535,7 +2535,7 @@ define transform-classes.jar-to-dex
$(hide) rm -f $(dir $@)classes*.dex $(hide) rm -f $(dir $@)classes*.dex
$(hide) $(DX_COMMAND) \ $(hide) $(DX_COMMAND) \
--dex --output=$(dir $@) \ --dex --output=$(dir $@) \
--min-sdk-version=$(call codename-or-sdk-to-sdk,$(PRIVATE_DEFAULT_APP_TARGET_SDK)) \ --min-sdk-version=$(PRIVATE_MIN_SDK_VERSION) \
$(if $(NO_OPTIMIZE_DX), \ $(if $(NO_OPTIMIZE_DX), \
--no-optimize) \ --no-optimize) \
$(if $(GENERATE_DEX_DEBUG), \ $(if $(GENERATE_DEX_DEBUG), \

18
core/host_dalvik_java_library.mk
View File

@@ -209,13 +209,23 @@ $(LOCAL_BUILT_MODULE): $(built_dex) $(java_resource_sources)
endif # !LOCAL_IS_STATIC_JAVA_LIBRARY endif # !LOCAL_IS_STATIC_JAVA_LIBRARY
ifneq (,$(filter-out current system_current test_current, $(LOCAL_SDK_VERSION))) ifneq (,$(filter-out current system_current test_current, $(LOCAL_SDK_VERSION)))
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_DEFAULT_APP_TARGET_SDK := $(LOCAL_SDK_VERSION) my_default_app_target_sdk := $(LOCAL_SDK_VERSION)
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_SDK_VERSION := $(LOCAL_SDK_VERSION) my_sdk_version := $(LOCAL_SDK_VERSION)
else else
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_DEFAULT_APP_TARGET_SDK := $(DEFAULT_APP_TARGET_SDK) my_default_app_target_sdk := $(DEFAULT_APP_TARGET_SDK)
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_SDK_VERSION := $(PLATFORM_SDK_VERSION) my_sdk_version := $(PLATFORM_SDK_VERSION)
endif endif
ifdef LOCAL_MIN_SDK_VERSION
my_min_sdk_version := $(LOCAL_MIN_SDK_VERSION)
else
my_min_sdk_version := $(call codename-or-sdk-to-sdk,$(my_default_app_target_sdk))
endif
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_DEFAULT_APP_TARGET_SDK := $(my_default_app_target_sdk)
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_SDK_VERSION := $(my_sdk_version)
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_MIN_SDK_VERSION := $(my_min_sdk_version)
else # LOCAL_JACK_ENABLED else # LOCAL_JACK_ENABLED
$(LOCAL_INTERMEDIATE_TARGETS): \ $(LOCAL_INTERMEDIATE_TARGETS): \
PRIVATE_JACK_INTERMEDIATES_DIR := $(intermediates.COMMON)/jack-rsc PRIVATE_JACK_INTERMEDIATES_DIR := $(intermediates.COMMON)/jack-rsc

26
core/java.mk
View File

@@ -73,6 +73,13 @@ ifdef LOCAL_JACK_ENABLED
endif endif
endif endif
ifdef LOCAL_MIN_SDK_VERSION
my_min_sdk_version := $(LOCAL_MIN_SDK_VERSION)
else
my_min_sdk_version := $(call codename-or-sdk-to-sdk,\
$(PRIVATE_DEFAULT_APP_TARGET_SDK))
endif
ifndef LOCAL_SDK_VERSION ifndef LOCAL_SDK_VERSION
ifneq ($(LOCAL_NO_STANDARD_LIBRARIES),true) ifneq ($(LOCAL_NO_STANDARD_LIBRARIES),true)
LOCAL_JAVA_LIBRARIES := $(TARGET_DEFAULT_JAVA_LIBRARIES) $(LOCAL_JAVA_LIBRARIES) LOCAL_JAVA_LIBRARIES := $(TARGET_DEFAULT_JAVA_LIBRARIES) $(LOCAL_JAVA_LIBRARIES)
@@ -805,13 +812,24 @@ $(LOCAL_MODULE)-findbugs : $(findbugs_html)
endif # full_classes_jar is defined endif # full_classes_jar is defined
ifneq (,$(filter-out current system_current test_current, $(LOCAL_SDK_VERSION))) ifneq (,$(filter-out current system_current test_current, $(LOCAL_SDK_VERSION)))
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_DEFAULT_APP_TARGET_SDK := $(LOCAL_SDK_VERSION) my_default_app_target_sdk := $(LOCAL_SDK_VERSION)
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_SDK_VERSION := $(LOCAL_SDK_VERSION) my_sdk_version := $(LOCAL_SDK_VERSION)
else else
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_DEFAULT_APP_TARGET_SDK := $(DEFAULT_APP_TARGET_SDK) my_default_app_target_sdk := $(DEFAULT_APP_TARGET_SDK)
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_SDK_VERSION := $(PLATFORM_SDK_VERSION) my_sdk_version := $(PLATFORM_SDK_VERSION)
endif endif
ifdef LOCAL_MIN_SDK_VERSION
my_min_sdk_version := $(LOCAL_MIN_SDK_VERSION)
else
my_min_sdk_version := $(call codename-or-sdk-to-sdk,$(my_default_app_target_sdk))
endif
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_DEFAULT_APP_TARGET_SDK := $(my_default_app_target_sdk)
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_SDK_VERSION := $(my_sdk_version)
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_MIN_SDK_VERSION := $(my_min_sdk_version)
ifdef LOCAL_JACK_ENABLED ifdef LOCAL_JACK_ENABLED
$(LOCAL_INTERMEDIATE_TARGETS): \ $(LOCAL_INTERMEDIATE_TARGETS): \
PRIVATE_JACK_INTERMEDIATES_DIR := $(intermediates.COMMON)/jack-rsc PRIVATE_JACK_INTERMEDIATES_DIR := $(intermediates.COMMON)/jack-rsc