summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorChih-Chung Chang <chihchung@google.com>2012-03-08 12:10:53 (GMT)
committerChih-Chung Chang <chihchung@google.com>2012-03-08 12:10:53 (GMT)
commit5a4d66d474ec876a2a28fd5927890c18f18907e5 (patch)
tree9ec726303b36bff9cb790c1e5c3a8e1793e0a415 /Android.mk
parent99d437c1e7521225844385be99dd81c0a43b3489 (diff)
downloadandroid_packages_apps_Snap-5a4d66d474ec876a2a28fd5927890c18f18907e5.zip
android_packages_apps_Snap-5a4d66d474ec876a2a28fd5927890c18f18907e5.tar.gz
android_packages_apps_Snap-5a4d66d474ec876a2a28fd5927890c18f18907e5.tar.bz2
Merge Camera into Gallery package.
Change-Id: If66d4b841eec3d3f5384a561b07c0eeade92597a
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk18
1 files changed, 15 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk
index 0f5170f..6584c4a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -8,17 +8,29 @@ 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, ../Camera/src)
+
+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
LOCAL_OVERRIDES_PACKAGES := Gallery Gallery3D GalleryNew3D
-# We mark this out until Mtp and MediaMetadataRetriever is unhidden.
-LOCAL_SDK_VERSION := current
+#LOCAL_SDK_VERSION := current
+
+LOCAL_JNI_SHARED_LIBRARIES := libjni_mosaic
+
+LOCAL_REQUIRED_MODULES := libjni_mosaic
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
include $(BUILD_PACKAGE)
-# Use the following include to make our test apk.
+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)
+endif