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

Commit 20e7b656 authored by Anton Hansson's avatar Anton Hansson Committed by Gerrit Code Review
Browse files

Merge "Set LOCAL_SDK_VERSION := current for RROs"

parents d0b97582 8549417b

core/generate_enforce_rro.mk

+6 −0
Original line number Diff line number Diff line
@@ -27,4 +27,10 @@ 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))

LOCAL_PRIVATE_PLATFORM_APIS := true

else

LOCAL_SDK_VERSION := current

endif



include $(BUILD_RRO_PACKAGE)

core/local_systemsdk.mk

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ ifdef BOARD_SYSTEMSDK_VERSIONS 
  ifneq (,$(filter JAVA_LIBRARIES APPS,$(LOCAL_MODULE_CLASS)))

    ifndef LOCAL_SDK_VERSION

      ifeq ($(_is_vendor_app),true)

        ifeq (,$(findstring __auto_generated_rro,$(LOCAL_MODULE)))

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

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

          # against System SDK.

          # TODO(b/35859726): remove this exception