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

Commit af12f13b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "RRO for framework-res.apk is not force built against SystemSDK" into pi-dev

parents 45d11bbe d8c4c30b

core/local_systemsdk.mk

+6 −1
Original line number Diff line number Diff line
@@ -25,11 +25,16 @@ 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)))

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

          # against System SDK.

          # TODO(b/35859726): remove this exception

          LOCAL_SDK_VERSION := system_current

        endif

      endif

    endif

  endif

endif



# Ensure that the selected System SDK version is one of the supported versions.

# The range of support versions becomes narrower when BOARD_SYSTEMSDK_VERSIONS