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

Commit 229963ee authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Exempt RRO from the restriction on API level" am: 02031027 

Change-Id: I17e5508f5ed6f1bf36871a88f0e10a929330d7c6
parents ded93f2a 02031027

core/local_systemsdk.mk

+3 −3
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#



ifdef BOARD_SYSTEMSDK_VERSIONS

  # Apps and jars in vendor or odm partition are forced to build against System SDK.

  # Apps and jars in vendor, product or odm partition are forced to build against System SDK.

  _cannot_use_platform_apis :=

  ifneq (,$(filter true,$(LOCAL_VENDOR_MODULE) $(LOCAL_ODM_MODULE) $(LOCAL_PROPRIETARY_MODULE)))

    # Note: no need to check LOCAL_MODULE_PATH* since LOCAL_[VENDOR|ODM|OEM]_MODULE is already
@@ -29,9 +29,9 @@ ifdef BOARD_SYSTEMSDK_VERSIONS 
  ifneq (,$(filter JAVA_LIBRARIES APPS,$(LOCAL_MODULE_CLASS)))

    ifndef LOCAL_SDK_VERSION

      ifeq ($(_cannot_use_platform_apis),true)

        ifeq (,$(findstring __auto_generated_rro_,$(LOCAL_MODULE)))

        ifeq (,$(LOCAL_IS_RUNTIME_RESOURCE_OVERLAY))

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

          # TODO(b/35859726): remove this exception

          # TODO(b/155027019): remove this, after no product/vendor apps rely on this behavior.

          LOCAL_SDK_VERSION := system_current

        endif

      endif