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

This commit is contained in:
Treehugger Robot 2019-04-18 21:15:18 +00:00 committed by Gerrit Code Review
commit e55ec5ba1b

View file

@ -39,8 +39,8 @@ ifneq (,$(filter --extra-packages,$(LOCAL_AAPT_FLAGS)))
endif endif
# AAPT2 is pickier about missing resources. Support library may have references to resources # 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. # added in current, so always treat LOCAL_SDK_VERSION := <number> as LOCAL_SDK_RES_VERSION := current.
ifdef LOCAL_SDK_VERSION ifneq (,$(filter-out current system_current test_current core_current,$(LOCAL_SDK_VERSION)))
LOCAL_SDK_RES_VERSION := current LOCAL_SDK_RES_VERSION := current
endif endif