commit 5c721d9e6df069b6385929817bb2b61faeba25a3
author Andrew Sapperstein <asapperstein@google.com> Fri Jun 22 16:19:27 2012 -0700
committer Andrew Sapperstein <asapperstein@google.com> Mon Jun 25 11:57:17 2012 -0700
tree 1db55bb611be384277d0358f66931a069705e508
parent b47d8b00d8c69c853a3f8a4de1137acbd4285ff7

Removing the photo viewer from unified mail.

Change-Id: Iea42c019fa31a7ead997505da295eb4aae0e2e4e

Android.mk

diff --git a/Android.mk b/Android.mk
index e91e7d8..68e3281 100644
--- a/Android.mk
+++ b/Android.mk
@@ -16,7 +16,10 @@
 
 # Include res dir from chips
 chips_dir := ../../../frameworks/ex/chips/res
-res_dirs := $(chips_dir) res
+
+#Include res dir from photoviewer
+photo_dir := ../../../frameworks/ex/photoviewer/res
+res_dirs := $(chips_dir) $(photo_dir) res
 
 ##################################################
 # Build APK
@@ -26,6 +29,7 @@
 LOCAL_PACKAGE_NAME := UnifiedEmail
 
 LOCAL_STATIC_JAVA_LIBRARIES := android-common-chips
+LOCAL_STATIC_JAVA_LIBRARIES += android-common-photoviewer
 LOCAL_STATIC_JAVA_LIBRARIES += guava
 LOCAL_STATIC_JAVA_LIBRARIES += android-common
 LOCAL_STATIC_JAVA_LIBRARIES += com.android.emailcommon
@@ -38,7 +42,7 @@
         $(call all-logtags-files-under, $(src_dirs))
 LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs)) $(LOCAL_PATH)/res
 LOCAL_AAPT_FLAGS := --auto-add-overlay
-LOCAL_AAPT_FLAGS += --extra-packages com.android.ex.chips
+LOCAL_AAPT_FLAGS += --extra-packages com.android.ex.chips:com.android.ex.photo
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags