summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2012-10-31 00:34:20 (GMT)
committerJohn Reck <jreck@google.com>2012-10-31 22:01:13 (GMT)
commitbc7949a0bb4c1d69ca7dd395f4aeecabafc1b610 (patch)
tree2d45b6fe5132e6d899ca178f4266a6f8608f5796 /Android.mk
parent4e524038faeda08e9d1ded6500ef543c61c2f4e5 (diff)
downloadandroid_packages_apps_Snap-bc7949a0bb4c1d69ca7dd395f4aeecabafc1b610.zip
android_packages_apps_Snap-bc7949a0bb4c1d69ca7dd395f4aeecabafc1b610.tar.gz
android_packages_apps_Snap-bc7949a0bb4c1d69ca7dd395f4aeecabafc1b610.tar.bz2
Gingerbread support-ish
This reverts commit 1336062985c9824d7fd796b1cebd5eaa8e4163ca. Change-Id: I718ec56315dc207a3e612abb4576bddab9afa2ee
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index a5efe55..4712b44 100644
--- a/Android.mk
+++ b/Android.mk
@@ -11,13 +11,15 @@ LOCAL_STATIC_JAVA_LIBRARIES += mp4parser
LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-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
+ --extra-packages com.android.camera:com.actionbarsherlock
LOCAL_PACKAGE_NAME := Gallery2