summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorOwen Lin <owenlin@google.com>2012-08-24 13:02:22 +0800
committerOwen Lin <owenlin@google.com>2012-08-24 13:02:22 +0800
commit989c84cf319b3cb162af3ae7d5ca73520ae75695 (patch)
tree5e00168fd8408d8326330ba311ffbd50f42b3585 /Android.mk
parent859110b0cddf275c35f7c9c835a5a85784d4e93e (diff)
downloadandroid_packages_apps_Snap-989c84cf319b3cb162af3ae7d5ca73520ae75695.tar.gz
android_packages_apps_Snap-989c84cf319b3cb162af3ae7d5ca73520ae75695.tar.bz2
android_packages_apps_Snap-989c84cf319b3cb162af3ae7d5ca73520ae75695.zip
Revert "Uses ActionBarSherlock library in MovieActivity."
This reverts commit 89b437722a24d0c7d6e2acffc30c215f22814234.
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk9
1 files changed, 2 insertions, 7 deletions
diff --git a/Android.mk b/Android.mk
index 570b46f30..4854a5c5e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -9,15 +9,10 @@ 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
-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_RESOURCE_DIR += $(LOCAL_PATH)/res packages/apps/Camera/res
+LOCAL_AAPT_FLAGS := --auto-add-overlay --extra-packages com.android.camera
LOCAL_PACKAGE_NAME := Gallery2