summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorMichael Kolb <kolby@google.com>2013-01-29 10:33:22 -0800
committerMichael Kolb <kolby@google.com>2013-01-29 10:51:20 -0800
commit25668cd6ed661c59295cb65348a126fb245757d4 (patch)
treef7deff61aef4ee2ff24f40499ecddf0d71c063dc /Android.mk
parentd0f8807ca66b006e4049e32ad187a808c42e1f00 (diff)
downloadandroid_packages_apps_Gallery2-25668cd6ed661c59295cb65348a126fb245757d4.zip
android_packages_apps_Gallery2-25668cd6ed661c59295cb65348a126fb245757d4.tar.gz
android_packages_apps_Gallery2-25668cd6ed661c59295cb65348a126fb245757d4.tar.bz2
Move Camera Java/Native source into Gallery2
Change-Id: I968efe4d656e88a7760d3c0044f65b4adac2ddd1
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk7
1 files changed, 2 insertions, 5 deletions
diff --git a/Android.mk b/Android.mk
index a5efe55..11c7160 100644
--- a/Android.mk
+++ b/Android.mk
@@ -11,7 +11,6 @@ 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, ../Camera/src)
LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res
LOCAL_RESOURCE_DIR += packages/apps/Camera/res
@@ -41,10 +40,8 @@ include $(BUILD_PACKAGE)
include $(call all-makefiles-under, jni)
ifeq ($(strip $(LOCAL_PACKAGE_OVERRIDES)),)
-# Use the following include to make gallery test apk.
-include $(call all-makefiles-under, $(LOCAL_PATH))
-# Use the following include to make camera test apk.
-include $(call all-makefiles-under, ../Camera)
+# Use the following include to make gallery test apk and the mosaic library
+include $(call all-makefiles-under, $(LOCAL_PATH))
endif