diff options
| author | 2020-04-27 22:42:01 +0000 | |
|---|---|---|
| committer | 2020-04-27 22:42:01 +0000 | |
| commit | 02031027b70344bb575bb88ea5f3d0e15c10c0ab (patch) | |
| tree | 0503d6453c1146a32e1bd0e4c1c038b5d2c1ae92 | |
| parent | 0d5a6748a891cbf5dc0916171da0a0aeed5783a6 (diff) | |
| parent | 07a44f48dcd0825cd3105b7395744da678199b08 (diff) | |
Merge "Exempt RRO from the restriction on API level"
| -rw-r--r-- | core/local_systemsdk.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/local_systemsdk.mk b/core/local_systemsdk.mk index 2b73f93209..460073daf7 100644 --- a/core/local_systemsdk.mk +++ b/core/local_systemsdk.mk @@ -15,7 +15,7 @@ # ifdef BOARD_SYSTEMSDK_VERSIONS - # Apps and jars in vendor or odm partition are forced to build against System SDK. + # Apps and jars in vendor, product or odm partition are forced to build against System SDK. _cannot_use_platform_apis := ifneq (,$(filter true,$(LOCAL_VENDOR_MODULE) $(LOCAL_ODM_MODULE) $(LOCAL_PROPRIETARY_MODULE))) # Note: no need to check LOCAL_MODULE_PATH* since LOCAL_[VENDOR|ODM|OEM]_MODULE is already @@ -29,9 +29,9 @@ ifdef BOARD_SYSTEMSDK_VERSIONS ifneq (,$(filter JAVA_LIBRARIES APPS,$(LOCAL_MODULE_CLASS))) ifndef LOCAL_SDK_VERSION ifeq ($(_cannot_use_platform_apis),true) - ifeq (,$(findstring __auto_generated_rro_,$(LOCAL_MODULE))) + ifeq (,$(LOCAL_IS_RUNTIME_RESOURCE_OVERLAY)) # Runtime resource overlays are exempted from building against System SDK. - # TODO(b/35859726): remove this exception + # TODO(b/155027019): remove this, after no product/vendor apps rely on this behavior. LOCAL_SDK_VERSION := system_current endif endif |