Commit 85f2b4a6 authored Apr 18, 2019 by Colin Cross

Don't set LOCAL_SDK_RES_VERSION to current if LOCAL_SDK_VERSION is core_current

Removing AAPT1 support removed the distinction between unset
LOCAL_USE_AAPT2 and LOCAL_USE_AAPT2 := true, which enabled the
LCOAL_SDK_RES_VERSION setting for some modules that had previously
bypassed it because of LOCAL_USE_AAPT2 := true.  The workaround
was too broad, it shouldn't apply if LOCAL_SDK_VERSION is already
set to *current.  In particular, if it is core_current to disable
using framework-res.apk completely, then LOCAL_SDK_RES_VERSION
must not be set to current.

Fixes: 130782219
Test: atest android.server.wm.PrereleaseSdkTest
Change-Id: I250d65b1ef66e591f2c9779580df4cc3f0f2b028

parent e6210f6e

core/force_aapt2.mk

+2 −2

Original line number	Diff line number	Diff line
		@@ -39,8 +39,8 @@ ifneq (,$(filter --extra-packages,$(LOCAL_AAPT_FLAGS)))
		endif

		# AAPT2 is pickier about missing resources. Support library may have references to resources
		# added in current, so always treat LOCAL_SDK_VERSION as LOCAL_SDK_RES_VERSION := current.
		ifdef LOCAL_SDK_VERSION
		# added in current, so always treat LOCAL_SDK_VERSION := <number> as LOCAL_SDK_RES_VERSION := current.
		ifneq (,$(filter-out current system_current test_current core_current,$(LOCAL_SDK_VERSION)))
		LOCAL_SDK_RES_VERSION := current
		endif