From 85f2b4a68000b84762fc6f9ae4af3b9f14287c37 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 18 Apr 2019 10:20:49 -0700 Subject: [PATCH] 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 --- core/force_aapt2.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/force_aapt2.mk b/core/force_aapt2.mk index 816138a5b..25b45e480 100644 --- a/core/force_aapt2.mk +++ b/core/force_aapt2.mk @@ -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 := 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