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

Commit c15e211a authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Support core_current when exporting resources from a package" am: 64006ad4 

am: 44cca076

Change-Id: I3fb400c2567abf6d4f2c618a9786a59a29f2a8d2
parents 18f0f94b 44cca076

core/package_internal.mk

+3 −1
Original line number Diff line number Diff line
@@ -471,7 +471,9 @@ ifneq ($(LOCAL_NO_STANDARD_LIBRARIES),true) 
# Most packages should link against the resources defined by framework-res.

# Even if they don't have their own resources, they may use framework

# resources.

ifneq ($(filter-out current system_current test_current,$(LOCAL_SDK_RES_VERSION))$(if $(TARGET_BUILD_APPS),$(filter current system_current test_current,$(LOCAL_SDK_RES_VERSION))),)

ifeq ($(LOCAL_SDK_RES_VERSION),core_current)

# core_current doesn't contain any framework resources.

else ifneq ($(filter-out current system_current test_current,$(LOCAL_SDK_RES_VERSION))$(if $(TARGET_BUILD_APPS),$(filter current system_current test_current,$(LOCAL_SDK_RES_VERSION))),)

# for released sdk versions, the platform resources were built into android.jar.

framework_res_package_export := \

    $(HISTORICAL_SDK_VERSIONS_ROOT)/$(LOCAL_SDK_RES_VERSION)/android.jar