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

Merge "Consolidate the logic for the sdk prebuilt module names." am: 9b72b53a24

Browse Source 
am: 762e03ad41

Change-Id: I79ba2766028f2f26836a3a6d99eb5e8311f31921
This commit is contained in:
Anton Hansson
2018-04-11 02:27:37 -07:00
committed by android-build-merger
parent b2adc8ebeb 762e03ad41
commit 395092db03
4 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java_common.mk
View File

@@ -261,11 +261,10 @@ ifndef LOCAL_IS_HOST_MODULE
else ifeq ($(LOCAL_SDK_VERSION)$(TARGET_BUILD_APPS),core_current)
full_java_bootclasspath_libs := $(call java-lib-header-files,core.current.stubs)
else
# core_<ver> is subset of <ver>. Instead of defining a prebuilt lib for core_<ver>,
# use the stub for <ver> when building for apps.
_version := $(patsubst core_%,%,$(LOCAL_SDK_VERSION))
full_java_bootclasspath_libs := $(call java-lib-header-files,sdk_v$(_version))
_version :=
# TARGET_BUILD_APPS is set. Use the modules defined in prebuilts/sdk/Android.mk.
_module_name := $(call resolve-prebuilt-sdk-module,$(LOCAL_SDK_VERSION))
full_java_bootclasspath_libs := $(call java-lib-header-files,$(_module_name))
_module_name :=
endif # current, system_current, system_${VER}, test_current or core_current
endif # LOCAL_SDK_VERSION