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

Merge "RRO shouldn't depend on frameworks or system(_ext) app when TARGET_BUILD_UNBUNDLED" am: a7f8c55374 am: 72bde32481 am: 6ac14409a7 am: be4966b9e9

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/1722679

Change-Id: I1339696ceebfd4afec4e625d893eea8f2011fb34
This commit is contained in:
Treehugger Robot
2021-06-02 04:22:00 +00:00
committed by Automerger Merge Worker
parent 7ad0bc3046 be4966b9e9
commit 83b5315c08
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/generate_enforce_rro.mk
View File

@@ -29,9 +29,12 @@ $(rro_android_manifest_file): build/make/tools/generate-enforce-rro-android-mani
LOCAL_PATH:= $(intermediates) LOCAL_PATH:= $(intermediates)
# TODO(b/187404676): remove this condition when the prebuilt for packges exporting resource exists.
ifeq (,$(TARGET_BUILD_UNBUNDLED))
ifeq ($(enforce_rro_use_res_lib),true) ifeq ($(enforce_rro_use_res_lib),true)
LOCAL_RES_LIBRARIES := $(enforce_rro_source_module) LOCAL_RES_LIBRARIES := $(enforce_rro_source_module)
endif endif
endif
LOCAL_FULL_MANIFEST_FILE := $(rro_android_manifest_file) LOCAL_FULL_MANIFEST_FILE := $(rro_android_manifest_file)
@@ -45,8 +48,9 @@ else ifeq (vendor,$(enforce_rro_partition))
else else
$(error Unsupported partition. Want: [vendor/product] Got: [$(enforce_rro_partition)]) $(error Unsupported partition. Want: [vendor/product] Got: [$(enforce_rro_partition)])
endif endif
ifneq (,$(TARGET_BUILD_UNBUNDLED))
ifneq (,$(LOCAL_RES_LIBRARIES)) LOCAL_SDK_VERSION := current
else ifneq (,$(LOCAL_RES_LIBRARIES))
# Technically we are linking against the app (if only to grab its resources), # 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. # and because it's potentially not building against the SDK, we can't either.
LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_PRIVATE_PLATFORM_APIS := true