From 9f60e4709b4740a8fb616346d99d6ed8d919349d Mon Sep 17 00:00:00 2001 From: Michael Kolb Date: Tue, 29 Jan 2013 10:33:22 -0800 Subject: Move Camera Java/Native source into Gallery2 Change-Id: I968efe4d656e88a7760d3c0044f65b4adac2ddd1 --- Android.mk | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index a5efe5500..11c716063 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 -- cgit v1.2.3