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

Commit 6ac14409 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "RRO shouldn't depend on frameworks or system(_ext) app when... 

Merge "RRO shouldn't depend on frameworks or system(_ext) app when TARGET_BUILD_UNBUNDLED" am: a7f8c553 am: 72bde324

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

Change-Id: I925788776c863d898928bee8b0e2ab131c8b925a
parents 0f28440f 72bde324

core/generate_enforce_rro.mk

+6 −2
Original line number Diff line number Diff line
@@ -29,9 +29,12 @@ $(rro_android_manifest_file): build/make/tools/generate-enforce-rro-android-mani 


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)

  LOCAL_RES_LIBRARIES := $(enforce_rro_source_module)

endif

endif



LOCAL_FULL_MANIFEST_FILE := $(rro_android_manifest_file)
@@ -45,8 +48,9 @@ else ifeq (vendor,$(enforce_rro_partition)) 
else

  $(error Unsupported partition. Want: [vendor/product] Got: [$(enforce_rro_partition)])

endif



ifneq (,$(LOCAL_RES_LIBRARIES))

ifneq (,$(TARGET_BUILD_UNBUNDLED))

  LOCAL_SDK_VERSION := current

else 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