p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

This commit is contained in:
Treehugger Robot 2018-03-27 03:28:32 +00:00 committed by Gerrit Code Review
parent dad6450cd3 c0ece103ec
commit 73b009e96c
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))) ifneq (,$(filter JAVA_LIBRARIES APPS,$(LOCAL_MODULE_CLASS)))
ifndef LOCAL_SDK_VERSION ifndef LOCAL_SDK_VERSION
ifeq ($(_is_vendor_app),true) 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 endif
endif endif