openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

am 657f497b: am 589e8c52: Use TARGET_DEFAULT_JAVA_LIBRARIES instead of just framework. 

* commit '657f497b978628221bba2e4418f0f8a22a308bf9':
  Use TARGET_DEFAULT_JAVA_LIBRARIES instead of just framework.
This commit is contained in:
Ying Wang 2015-05-20 13:15:32 +00:00 committed by Android Git Automerger
parent dbd37efcae 657f497b97
commit b7b99633e9
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/config.mk
View File

@ -629,6 +629,13 @@ include $(BUILD_SYSTEM)/clang/config.mk
HISTORICAL_SDK_VERSIONS_ROOT := $(TOPDIR)prebuilts/sdk
HISTORICAL_NDK_VERSIONS_ROOT := $(TOPDIR)prebuilts/ndk
# The path where app can reference the support library resources.
ifdef TARGET_BUILD_APPS
SUPPORT_LIBRARY_ROOT := $(HISTORICAL_SDK_VERSIONS_ROOT)/current/support
else
SUPPORT_LIBRARY_ROOT := frameworks/support
endif
# Historical SDK version N is stored in $(HISTORICAL_SDK_VERSIONS_ROOT)/N.
# The 'current' version is whatever this source tree is.
#

2
core/java.mk
View File

@ -447,7 +447,7 @@ ifdef TARGET_BUILD_APPS
else
# For platform build, we can't just raise to the "current" SDK,
# that would break apps that use APIs removed from the current SDK.
my_support_library_sdk_raise := $(call java-lib-files,framework)
my_support_library_sdk_raise := $(call java-lib-files,$(TARGET_DEFAULT_JAVA_LIBRARIES))
endif
endif
endif