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

Commit 9a50c1f4 authored by Anton Hansson's avatar Anton Hansson Committed by Gerrit Code Review
Browse files

Merge "Exempt some RROs from building against SDK"

parents 78398610 038177ba

core/generate_enforce_rro.mk

+7 −3
Original line number Diff line number Diff line
@@ -27,7 +27,11 @@ LOCAL_CERTIFICATE := platform 
LOCAL_AAPT_FLAGS += --auto-add-overlay

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

else

  LOCAL_SDK_VERSION := current

core/local_systemsdk.mk

+2 −3
Original line number Diff line number Diff line
@@ -25,9 +25,8 @@ ifdef BOARD_SYSTEMSDK_VERSIONS 
  ifneq (,$(filter JAVA_LIBRARIES APPS,$(LOCAL_MODULE_CLASS)))

    ifndef LOCAL_SDK_VERSION

      ifeq ($(_is_vendor_app),true)

        ifeq (,$(filter framework-res__auto_generated_rro,$(LOCAL_MODULE)))

          # Runtime resource overlay for framework-res is exempted from building

          # against System SDK.

        ifeq (,$(filter %__auto_generated_rro,$(LOCAL_MODULE)))

          # Runtime resource overlays are exempted from building against System SDK.

          # TODO(b/35859726): remove this exception

          LOCAL_SDK_VERSION := system_current

        endif