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

Merge "Respect LOCAL_MIN_SDK_VERSION for dx" am: a426e0e974 am: bf7020608f

Browse Source 
am: 01b57501d8

Change-Id: I7ac0abdd8ee4a0fe0d4d60f05a967efcbbc59688
This commit is contained in:
Colin Cross
2017-09-29 20:28:23 +00:00
committed by android-build-merger
parent 34d99c17f4 01b57501d8
commit e3248f5eef
3 changed files with 37 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
core/java.mk
View File

@@ -73,6 +73,13 @@ ifdef LOCAL_JACK_ENABLED
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
ifneq ($(LOCAL_NO_STANDARD_LIBRARIES),true)
LOCAL_JAVA_LIBRARIES := $(TARGET_DEFAULT_JAVA_LIBRARIES) $(LOCAL_JAVA_LIBRARIES)
@@ -818,13 +825,24 @@ $(LOCAL_MODULE)-findbugs : $(findbugs_html)
endif # full_classes_jar is defined
ifneq (,$(filter-out current system_current test_current, $(LOCAL_SDK_VERSION)))
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_DEFAULT_APP_TARGET_SDK := $(LOCAL_SDK_VERSION)
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_SDK_VERSION := $(LOCAL_SDK_VERSION)
my_default_app_target_sdk := $(LOCAL_SDK_VERSION)
my_sdk_version := $(LOCAL_SDK_VERSION)
else
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_DEFAULT_APP_TARGET_SDK := $(DEFAULT_APP_TARGET_SDK)
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_SDK_VERSION := $(PLATFORM_SDK_VERSION)
my_default_app_target_sdk := $(DEFAULT_APP_TARGET_SDK)
my_sdk_version := $(PLATFORM_SDK_VERSION)
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
$(LOCAL_INTERMEDIATE_TARGETS): \
PRIVATE_JACK_INTERMEDIATES_DIR := $(intermediates.COMMON)/jack-rsc