summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoris Liu <tianliu@google.com>2013-01-31 19:03:48 -0800
committerDoris Liu <tianliu@google.com>2013-02-01 13:02:08 -0800
commit97611a7010f55149aa18ed250f4961ff27438b55 (patch)
tree8a53984408d9703e29df698a23107b974133a028
parent2c87db720ca1d6b76260ec86a5bbf29a19eb2c2f (diff)
downloadandroid_packages_apps_Snap-97611a7010f55149aa18ed250f4961ff27438b55.tar.gz
android_packages_apps_Snap-97611a7010f55149aa18ed250f4961ff27438b55.tar.bz2
android_packages_apps_Snap-97611a7010f55149aa18ed250f4961ff27438b55.zip
Move tests from camera to gallery2
Change-Id: If9143fff7d22295a5ad3bb01c4b860d07c3ee1c9
-rwxr-xr-xperftests/panorama/Android.mk26
-rw-r--r--tests_camera/Android.mk18
2 files changed, 44 insertions, 0 deletions
diff --git a/perftests/panorama/Android.mk b/perftests/panorama/Android.mk
new file mode 100755
index 000000000..17632df5c
--- /dev/null
+++ b/perftests/panorama/Android.mk
@@ -0,0 +1,26 @@
+local_target_dir := $(TARGET_OUT_DATA)/local/tmp
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_C_INCLUDES := \
+ $(LOCAL_PATH)/../../jni_mosaic/feature_mos/src \
+ $(LOCAL_PATH)/../../jni_mosaic/feature_stab/src \
+ $(LOCAL_PATH)/../../jni_mosaic/feature_stab/db_vlvm
+
+LOCAL_CFLAGS := -O3 -DNDEBUG
+
+LOCAL_SRC_FILES := benchmark.cpp
+
+LOCAL_SHARED_LIBRARIES := libjni_mosaic libGLESv2 libEGL
+
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_LDFLAGS := -llog -lGLESv2
+
+LOCAL_MODULE := panorama_bench
+
+LOCAL_MODULE_PATH := $(local_target_dir)
+
+include $(BUILD_EXECUTABLE)
diff --git a/tests_camera/Android.mk b/tests_camera/Android.mk
new file mode 100644
index 000000000..93fce12d6
--- /dev/null
+++ b/tests_camera/Android.mk
@@ -0,0 +1,18 @@
+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
+
+LOCAL_STATIC_JAVA_LIBRARIES := littlemock dexmaker
+
+# Include all test java files.
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_PACKAGE_NAME := CameraTests
+
+LOCAL_INSTRUMENTATION_FOR := Gallery2
+
+include $(BUILD_PACKAGE)