summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOwen Lin <owenlin@google.com>2012-08-24 07:09:42 (GMT)
committerOwen Lin <owenlin@google.com>2012-08-24 07:09:42 (GMT)
commitab1f41e4494426f835319fa2b1e1ee2a74034b34 (patch)
tree706fd72a980431c6d3643588eaf58c9d7b362204
parent989c84cf319b3cb162af3ae7d5ca73520ae75695 (diff)
downloadandroid_packages_apps_Snap-ab1f41e4494426f835319fa2b1e1ee2a74034b34.zip
android_packages_apps_Snap-ab1f41e4494426f835319fa2b1e1ee2a74034b34.tar.gz
android_packages_apps_Snap-ab1f41e4494426f835319fa2b1e1ee2a74034b34.tar.bz2
Revert "Revert "Uses ActionBarSherlock library in MovieActivity.""
This reverts commit 13da281769d4558c42d86a54536ff6da6826b0ac.
-rw-r--r--Android.mk9
1 files changed, 7 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index 4854a5c..570b46f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -9,10 +9,15 @@ LOCAL_STATIC_JAVA_LIBRARIES += com.android.gallery3d.common2
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_SRC_FILES += $(call all-java-files-under, src_pd)
+LOCAL_SRC_FILES += $(call all-java-files-under, actionbarsherlock/src)
LOCAL_SRC_FILES += $(call all-java-files-under, ../Camera/src)
-LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res packages/apps/Camera/res
-LOCAL_AAPT_FLAGS := --auto-add-overlay --extra-packages com.android.camera
+LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res
+LOCAL_RESOURCE_DIR += packages/apps/Camera/res
+LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/actionbarsherlock/res
+
+LOCAL_AAPT_FLAGS := --auto-add-overlay \
+ --extra-packages com.android.camera:com.actionbarsherlock
LOCAL_PACKAGE_NAME := Gallery2