commit 64006ad4f3d3fdf46bf8223e3001ae25b379b9c2
author Treehugger Robot <treehugger-gerrit@google.com> Fri Feb 16 23:41:26 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 16 23:41:26 2018 +0000
tree 1edceca2fe307aef74f31c10392bd9514c0bcfd9
parent 60431c098e6645c391b4b111f073624bafdebd97
parent c51b7b0d555385c43322439d42be3794881ca33f

Merge "Support core_current when exporting resources from a package"

core/package_internal.mk

diff --git a/core/package_internal.mk b/core/package_internal.mk
index 16c07a6..cd3a741 100644
--- a/core/package_internal.mk
+++ b/core/package_internal.mk
@@ -471,7 +471,9 @@
 # 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