commit e55ec5ba1b85fd7bdaca05fe0bf9093af9a565bb
author Treehugger Robot <treehugger-gerrit@google.com> Thu Apr 18 21:15:18 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 18 21:15:18 2019 +0000
tree 3197fe4261c46c7d5c0f920e1478f475e6176d2e
parent 0d4ee006db9b553af9c47a48e22c7d7610848d01
parent 85f2b4a68000b84762fc6f9ae4af3b9f14287c37

Merge "Don't set LOCAL_SDK_RES_VERSION to current if LOCAL_SDK_VERSION is core_current"

core/force_aapt2.mk

diff --git a/core/force_aapt2.mk b/core/force_aapt2.mk
index 816138a..25b45e4 100644
--- a/core/force_aapt2.mk
+++ b/core/force_aapt2.mk
@@ -39,8 +39,8 @@
 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