Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eaa2c875 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

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

am: e55ec5ba

Change-Id: I391295c91268c7853ff97d01156d02a222344492
parents a3f7a5fb e55ec5ba

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