From a611ca04d21a63ef2e3bce38923c786c29d1be85 Mon Sep 17 00:00:00 2001
From: Seigo Nonaka <nona@google.com>
Date: Wed, 19 Apr 2017 16:34:28 -0700
Subject: [PATCH] Fix build Gallery2

Test: N/A
Bug: N/A
Change-Id: I1822b79d421c025d3be63af040849bde7397ac25
---
 Android.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Android.mk b/Android.mk
index 670cc4cc9..14274224b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -14,9 +14,10 @@ LOCAL_SRC_FILES := \
     $(call all-renderscript-files-under, src)
 LOCAL_SRC_FILES += $(call all-java-files-under, src_pd)
 
-LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res
+LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res $(LOCAL_PATH)/../../../$(SUPPORT_LIBRARY_ROOT)/compat/res
 
 LOCAL_AAPT_FLAGS := --auto-add-overlay
+LOCAL_AAPT_FLAGS += --extra-packages android.support.compat
 
 LOCAL_PACKAGE_NAME := Gallery2
 
-- 
2.11.0