summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorPaul Westbrook <pwestbro@google.com>2012-12-19 14:46:44 -0800
committerPaul Westbrook <pwestbro@google.com>2012-12-19 15:03:24 -0800
commit7a131b2053cb64eaa2f979baef16c1a9c306da9f (patch)
treec58d7fe4fcb6dfc7204a771217f424f127d84ea2 /Android.mk
parent0f015b7e12c1588a332d623f503722e0d394c01c (diff)
downloadandroid_packages_apps_UnifiedEmail-7a131b2053cb64eaa2f979baef16c1a9c306da9f.tar.gz
android_packages_apps_UnifiedEmail-7a131b2053cb64eaa2f979baef16c1a9c306da9f.tar.bz2
android_packages_apps_UnifiedEmail-7a131b2053cb64eaa2f979baef16c1a9c306da9f.zip
build against frameworks/opt photo viewer
Bug: 7379833 Change-Id: Ib2d250dcc31573b5800475b36b43c9277327ef39
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index d843f1e43..a1c9cb67d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -18,7 +18,7 @@ LOCAL_PATH:= $(call my-dir)
chips_dir := ../../../frameworks/ex/chips/res
#Include res dir from photoviewer
-photo_dir := ../../../frameworks/ex/photoviewer/res
+photo_dir := ../../../frameworks/opt/photoviewer/res
res_dirs := $(chips_dir) $(photo_dir) res
##################################################
@@ -29,7 +29,7 @@ src_dirs := src unified_src
LOCAL_PACKAGE_NAME := UnifiedEmail
LOCAL_STATIC_JAVA_LIBRARIES := android-common-chips
-LOCAL_STATIC_JAVA_LIBRARIES += android-common-photoviewer
+LOCAL_STATIC_JAVA_LIBRARIES += libphotoviewer
LOCAL_STATIC_JAVA_LIBRARIES += guava
LOCAL_STATIC_JAVA_LIBRARIES += android-common
LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4