commit af12f13b50f40a296d176cf196347e6502d00ca8
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Mar 27 00:39:34 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 27 00:39:34 2018 +0000
tree 10916e006378377b18e3d1901274eec7e5da2798
parent 45d11bbedca72a19b7960305aeb75e5f04f862ae
parent d8c4c30ba4c3941c9ab9bc6498b498c4c630dbbe

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

core/local_systemsdk.mk

diff --git a/core/local_systemsdk.mk b/core/local_systemsdk.mk
index 6dab346..49085fd 100644
--- a/core/local_systemsdk.mk
+++ b/core/local_systemsdk.mk
@@ -25,7 +25,12 @@
   ifneq (,$(filter JAVA_LIBRARIES APPS,$(LOCAL_MODULE_CLASS)))
     ifndef LOCAL_SDK_VERSION
       ifeq ($(_is_vendor_app),true)
-        LOCAL_SDK_VERSION := system_current
+        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