From 8a861a02136d15b45b9dbdc80e4f3bcc9de057c8 Mon Sep 17 00:00:00 2001 From: Owen Lin Date: Fri, 24 Aug 2012 15:09:42 +0800 Subject: Revert "Revert "Uses ActionBarSherlock library in MovieActivity."" This reverts commit 13da281769d4558c42d86a54536ff6da6826b0ac. --- Android.mk | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index 4854a5c5e..570b46f30 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 -- cgit v1.2.3