Merge "RRO for framework-res.apk is not force built against SystemSDK"
This commit is contained in:
commit
73b009e96c
1 changed files with 6 additions and 1 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue