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

core/local_systemsdk.mk

@@ -25,10 +25,15 @@ 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.