From 9420375022064abfc1faa3e68d4beafc6138ac15 Mon Sep 17 00:00:00 2001
From: Jeff Gaston <jeffrygaston@google.com>
Date: Mon, 5 Mar 2018 14:23:11 -0500
Subject: [PATCH] Get Support Library resources from prebuilts

Support Library is changing its build process (postprocessing
resource files, via Dejetifier), so its resource files won't be
able to be used directly for now.

Bug: 74196535
Test: m -j checkbuild
Change-Id: I30410d817e4b0a70135c5ed9b7ab3a725307fe09
Merged-In: I30410d817e4b0a70135c5ed9b7ab3a725307fe09
(cherry picked from commit 12b8b856d1a66fd0263558d7c2cb5240f53b4ff1)
---
 library/Android.mk            | 6 +++---
 library/common-gingerbread.mk | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/library/Android.mk b/library/Android.mk
index 030733e..b0fa9f0 100644
--- a/library/Android.mk
+++ b/library/Android.mk
@@ -60,9 +60,9 @@ LOCAL_AAPT_FLAGS := --auto-add-overlay \
     --extra-packages android.support.v7.recyclerview
 
 LOCAL_RESOURCE_DIR += \
-    frameworks/support/compat/res \
-    frameworks/support/v7/appcompat/res \
-    frameworks/support/v7/recyclerview/res
+    prebuilts/sdk/current/supportcompat/res \
+    prebuilts/sdk/current/supportv7/appcompat/res \
+    prebuilts/sdk/current/supportv7/recyclerview/res
 
 LOCAL_JAVA_LIBRARIES := \
     android-support-annotations \
diff --git a/library/common-gingerbread.mk b/library/common-gingerbread.mk
index 6ced8b0..02642f2 100644
--- a/library/common-gingerbread.mk
+++ b/library/common-gingerbread.mk
@@ -41,14 +41,14 @@ endif
 
 # Include support-v7-appcompat, if not already included
 ifeq (,$(findstring android-support-v7-appcompat,$(LOCAL_STATIC_JAVA_LIBRARIES)))
-LOCAL_RESOURCE_DIR += frameworks/support/v7/appcompat/res
+LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/v7/appcompat/res
 LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.appcompat
 LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-appcompat
 endif
 
 # Include support-v7-recyclerview, if not already included
 ifeq (,$(findstring android-support-v7-recyclerview,$(LOCAL_STATIC_JAVA_LIBRARIES)))
-LOCAL_RESOURCE_DIR += frameworks/support/v7/recyclerview/res
+LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/v7/recyclerview/res
 LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.recyclerview
 LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-recyclerview
 endif