commit 17dc98d2c6f2427dcfaa1bff7f40a3e89132b512
author Andrew Sapperstein <asapperstein@google.com> Tue Aug 19 10:38:31 2014 -0700
committer Andrew Sapperstein <asapperstein@google.com> Tue Aug 19 10:38:31 2014 -0700
tree de0d010f2349ae3ea7d3ea8818ea2eacf707756a
parent b2a003cf45d4592c5d5fa59dc943dfb9d1d7ca09

Use appcompat photoviewer.

Change-Id: I3d65a9b797a5e990a28457ef880f0b0384bb821c

Android.mk

diff --git a/Android.mk b/Android.mk
index ef3693a..53c7cb2 100644
--- a/Android.mk
+++ b/Android.mk
@@ -19,7 +19,7 @@
 
 #Include res dir from libraries
 appcompat_dir := ../../../prebuilts/sdk/current/support/v7/appcompat/res
-photo_dir := ../../../frameworks/opt/photoviewer/res ../../../frameworks/opt/photoviewer/activity/res
+photo_dir := ../../../frameworks/opt/photoviewer/res ../../../frameworks/opt/photoviewer/appcompat/res
 gridlayout_dir := ../../../prebuilts/sdk/current/support/v7/gridlayout/res
 bitmap_dir := ../../../frameworks/opt/bitmap/res
 datetimepicker_dir := ../../../frameworks/opt/datetimepicker/res
@@ -33,7 +33,7 @@
 LOCAL_PACKAGE_NAME := UnifiedEmail
 
 LOCAL_STATIC_JAVA_LIBRARIES := libchips
-LOCAL_STATIC_JAVA_LIBRARIES += libphotoviewer
+LOCAL_STATIC_JAVA_LIBRARIES += libphotoviewer_appcompat
 LOCAL_STATIC_JAVA_LIBRARIES += guava
 LOCAL_STATIC_JAVA_LIBRARIES += android-common
 LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4