StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Exempt some RROs from building against SDK"

Browse Source
This commit is contained in:
Anton Hansson
2019-01-30 22:17:25 +00:00
committed by Gerrit Code Review
parent 7839861087 038177ba55
commit 9a50c1f438
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/generate_enforce_rro.mk
View File

@@ -27,7 +27,11 @@ LOCAL_CERTIFICATE := platform
LOCAL_AAPT_FLAGS += --auto-add-overlay LOCAL_AAPT_FLAGS += --auto-add-overlay
LOCAL_RESOURCE_DIR := $(enforce_rro_source_overlays) LOCAL_RESOURCE_DIR := $(enforce_rro_source_overlays)
ifeq (framework-res__auto_generated_rro,$(enforce_rro_module)) ifneq (,$(LOCAL_RES_LIBRARIES))
# Technically we are linking against the app (if only to grab its resources),
# and because it's potentially not building against the SDK, we can't either.
LOCAL_PRIVATE_PLATFORM_APIS := true
else ifeq (framework-res__auto_generated_rro,$(enforce_rro_module))
LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_PRIVATE_PLATFORM_APIS := true
else else
LOCAL_SDK_VERSION := current LOCAL_SDK_VERSION := current

5
core/local_systemsdk.mk
View File

@@ -25,9 +25,8 @@ ifdef BOARD_SYSTEMSDK_VERSIONS
ifneq (,$(filter JAVA_LIBRARIES APPS,$(LOCAL_MODULE_CLASS))) ifneq (,$(filter JAVA_LIBRARIES APPS,$(LOCAL_MODULE_CLASS)))
ifndef LOCAL_SDK_VERSION ifndef LOCAL_SDK_VERSION
ifeq ($(_is_vendor_app),true) ifeq ($(_is_vendor_app),true)
ifeq (,$(filter framework-res__auto_generated_rro,$(LOCAL_MODULE))) ifeq (,$(filter %__auto_generated_rro,$(LOCAL_MODULE)))
# Runtime resource overlay for framework-res is exempted from building # Runtime resource overlays are exempted from building against System SDK.
# against System SDK.
# TODO(b/35859726): remove this exception # TODO(b/35859726): remove this exception
LOCAL_SDK_VERSION := system_current LOCAL_SDK_VERSION := system_current
endif endif