Commit d8c4c30b authored Mar 26, 2018 by Jiyong Park

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 for 2018 Pixels
Change-Id: Ib9981b107d78691eef21f4525ebdac9866d5c50e

parent 824f1da0

core/local_systemsdk.mk

+6 −1

Original line number	Diff line number	Diff line
		@@ -25,11 +25,16 @@ ifdef BOARD_SYSTEMSDK_VERSIONS
		ifneq (,$(filter JAVA_LIBRARIES APPS,$(LOCAL_MODULE_CLASS)))
		ifndef LOCAL_SDK_VERSION
		ifeq ($(_is_vendor_app),true)
		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

		# Ensure that the selected System SDK version is one of the supported versions.
		# The range of support versions becomes narrower when BOARD_SYSTEMSDK_VERSIONS