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

Merge "RRO for framework-res.apk is not force built against SystemSDK" 

am: 73b009e96c

Change-Id: I183951990149b2c9e8016676f1f1a795028ece5d
This commit is contained in:
Jiyong Park 2018-03-27 03:38:56 +00:00 committed by android-build-merger
parent c050d6da06 73b009e96c
commit d60f6cbea7
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/local_systemsdk.mk
View File

@ -25,7 +25,12 @@ ifdef BOARD_SYSTEMSDK_VERSIONS
ifneq (,$(filter JAVA_LIBRARIES APPS,$(LOCAL_MODULE_CLASS)))
ifndef LOCAL_SDK_VERSION
ifeq ($(_is_vendor_app),true)
LOCAL_SDK_VERSION := system_current
ifeq (,$(findstring __auto_generated_rro,$(LOCAL_MODULE)))
# Runtime resource overlay for framework-res is exempted from building
# against System SDK.
# TODO(b/35859726): remove this exception
LOCAL_SDK_VERSION := system_current
endif
endif
endif
endif