From c0ece103ec11fdd7137f3b7069886305ea71ce4d Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Mon, 26 Mar 2018 17:16:33 +0900 Subject: [PATCH] RRO for framework-res.apk is not force built against SystemSDK When BOARD_SYSTEMSDK_VERSIONS is set, any apk in the vendor partition is force built against SystemSDK (or Android SDK if LOCAL_SDK_VERSION is set to current). However, there should be one exception to this: RRO for framework-res.apk. This is because the RRO is currently overriding resources that are not part of SystemSDK. Until SystemSDK is expanded to cover resources that are eligible for overriding, let's allow the direct dependency from RRO to framework-res.apk. Bug: 35859726 Bug: 76398918 Test: m -j Merged-In: Ib9981b107d78691eef21f4525ebdac9866d5c50e Change-Id: Ib9981b107d78691eef21f4525ebdac9866d5c50e (cherry picked from commit d8c4c30ba4c3941c9ab9bc6498b498c4c630dbbe) --- core/local_systemsdk.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/core/local_systemsdk.mk b/core/local_systemsdk.mk index 6dab34654..49085fd0d 100644 --- a/core/local_systemsdk.mk +++ b/core/local_systemsdk.mk @@ -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