summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOwen Lin <owenlin@google.com>2011-08-17 14:07:43 (GMT)
committerOwen Lin <owenlin@google.com>2011-08-18 05:33:50 (GMT)
commit4aee2ab0eeb7cb65c7128600b1284f8389d9b5b0 (patch)
tree35e056687ab31673c7f2b4446c99d331b48372eb
parenta053a3179cfee3d2bb666eff5f4f03a96b092e04 (diff)
downloadandroid_packages_apps_Snap-4aee2ab0eeb7cb65c7128600b1284f8389d9b5b0.zip
android_packages_apps_Snap-4aee2ab0eeb7cb65c7128600b1284f8389d9b5b0.tar.gz
android_packages_apps_Snap-4aee2ab0eeb7cb65c7128600b1284f8389d9b5b0.tar.bz2
Initial code for Gallery2.
fix: 5176434 Change-Id: I041e282b9c7b34ceb1db8b033be2b853bb3a992c
-rw-r--r--Android.mk24
-rw-r--r--gallerycommon/Android.mk27
-rw-r--r--tests/Android.mk17
3 files changed, 68 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
new file mode 100644
index 0000000..0f5170f
--- /dev/null
+++ b/Android.mk
@@ -0,0 +1,24 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13
+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_PACKAGE_NAME := Gallery2
+
+LOCAL_OVERRIDES_PACKAGES := Gallery Gallery3D GalleryNew3D
+
+# We mark this out until Mtp and MediaMetadataRetriever is unhidden.
+LOCAL_SDK_VERSION := current
+
+LOCAL_PROGUARD_FLAG_FILES := proguard.flags
+
+include $(BUILD_PACKAGE)
+
+# Use the following include to make our test apk.
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/gallerycommon/Android.mk b/gallerycommon/Android.mk
new file mode 100644
index 0000000..a942de2
--- /dev/null
+++ b/gallerycommon/Android.mk
@@ -0,0 +1,27 @@
+# Copyright 2011, The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+LOCAL_PATH := $(call my-dir)
+
+# Build the com.android.emailcommon static library. At the moment, this includes
+# the emailcommon files themselves plus everything under src/org (apache code). All of our
+# AIDL files are also compiled into the static library
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := com.android.gallery3d.common2
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_SDK_VERSION := 8
+
+include $(BUILD_STATIC_JAVA_LIBRARY)
diff --git a/tests/Android.mk b/tests/Android.mk
new file mode 100644
index 0000000..602f693
--- /dev/null
+++ b/tests/Android.mk
@@ -0,0 +1,17 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+# We only want this apk build for tests.
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_JAVA_LIBRARIES := android.test.runner
+
+# Include all test java files.
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_PACKAGE_NAME := Gallery2Tests
+LOCAL_CERTIFICATE := media
+
+LOCAL_INSTRUMENTATION_FOR := Gallery2
+
+include $(BUILD_PACKAGE)