summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSriram Raman <sriramkraman@google.com>2009-06-22 22:05:03 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-06-22 22:05:03 -0700
commit5e28318633b733b5effbf3c94a77e27178e2b39a (patch)
tree47953fa0de38ed2d51ad18c211cc78ae79d60c84
parenteefb04ecb1dd4b7aa2ad64a8cedff8220b0fcbb8 (diff)
parent9c67529d7bec42a60136677195c46c1cfd995645 (diff)
downloadextras-5e28318633b733b5effbf3c94a77e27178e2b39a.tar.gz
am 9c67529d: Remove sound, memtest, vibrator, timetest, cachetest from tests build
Merge commit '9c67529d7bec42a60136677195c46c1cfd995645' * commit '9c67529d7bec42a60136677195c46c1cfd995645': Remove sound, memtest, vibrator, timetest, cachetest from tests build
-rw-r--r--sound/Android.mk2
-rw-r--r--tests/framebuffer/Android.mk4
-rw-r--r--tests/fstest/Android.mk4
-rw-r--r--tests/icachetest/Android.mk2
-rw-r--r--tests/memtest/Android.mk2
-rw-r--r--tests/timetest/Android.mk2
6 files changed, 8 insertions, 8 deletions
diff --git a/sound/Android.mk b/sound/Android.mk
index 7a58998b..62174ccf 100644
--- a/sound/Android.mk
+++ b/sound/Android.mk
@@ -3,6 +3,6 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := sound
LOCAL_SRC_FILES := playwav.c
-LOCAL_MODULE_TAGS := tests
+LOCAL_MODULE_TAGS := optional
include $(BUILD_EXECUTABLE)
diff --git a/tests/framebuffer/Android.mk b/tests/framebuffer/Android.mk
index d6a8537d..4f789b9e 100644
--- a/tests/framebuffer/Android.mk
+++ b/tests/framebuffer/Android.mk
@@ -9,7 +9,7 @@ LOCAL_SHARED_LIBRARIES := \
LOCAL_MODULE:= test-fb-refresh
-LOCAL_MODULE_TAGS := tests
+LOCAL_MODULE_TAGS := optional
ifeq ($(TARGET_SIMULATOR),true)
ifeq ($(HOST_OS),linux)
@@ -26,7 +26,7 @@ ifneq ($(TARGET_SIMULATOR),true)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := fb_test.c
LOCAL_MODULE = test-fb-simple
-LOCAL_MODULE_TAGS := tests
+LOCAL_MODULE_TAGS := optional
LOCAL_FORCE_STATIC_EXECUTABLE := true
LOCAL_STATIC_LIBRARIES := libc
include $(BUILD_EXECUTABLE)
diff --git a/tests/fstest/Android.mk b/tests/fstest/Android.mk
index bf4f17c3..14c32aa0 100644
--- a/tests/fstest/Android.mk
+++ b/tests/fstest/Android.mk
@@ -22,7 +22,7 @@ LOCAL_SHARED_LIBRARIES := libc
LOCAL_MODULE := perm_checker
-LOCAL_MODULE_TAGS := tests
+LOCAL_MODULE_TAGS := optional
include $(BUILD_EXECUTABLE)
@@ -32,7 +32,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := perm_checker.conf
-LOCAL_MODULE_TAGS := tests
+LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := ETC
diff --git a/tests/icachetest/Android.mk b/tests/icachetest/Android.mk
index fca07ee1..39d0016f 100644
--- a/tests/icachetest/Android.mk
+++ b/tests/icachetest/Android.mk
@@ -9,6 +9,6 @@ LOCAL_SHARED_LIBRARIES := libc
LOCAL_MODULE:= icache
-LOCAL_MODULE_TAGS := tests
+LOCAL_MODULE_TAGS := optional
include $(BUILD_EXECUTABLE)
diff --git a/tests/memtest/Android.mk b/tests/memtest/Android.mk
index 36f233c7..06e2304d 100644
--- a/tests/memtest/Android.mk
+++ b/tests/memtest/Android.mk
@@ -11,7 +11,7 @@ LOCAL_SHARED_LIBRARIES := libc
LOCAL_MODULE:= memtest
-LOCAL_MODULE_TAGS := tests
+LOCAL_MODULE_TAGS := optional
## LOCAL_CFLAGS += -fstack-protector-all
LOCAL_CFLAGS += -fomit-frame-pointer
diff --git a/tests/timetest/Android.mk b/tests/timetest/Android.mk
index 918dea18..05e21fbe 100644
--- a/tests/timetest/Android.mk
+++ b/tests/timetest/Android.mk
@@ -7,7 +7,7 @@ LOCAL_SRC_FILES:= timetest.c
LOCAL_MODULE:= timetest
-LOCAL_MODULE_TAGS := tests
+LOCAL_MODULE_TAGS := optional
LOCAL_FORCE_STATIC_EXECUTABLE := true
LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT_SBIN)