summaryrefslogtreecommitdiff
path: root/libs/utils
diff options
context:
space:
mode:
author Jeff Brown <jeffbrown@google.com> 2010-07-15 10:24:10 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-07-15 10:24:10 -0700
commita903001e3cf392ba42bb124dfe82b94dea25e18f (patch)
tree802acc42d7113d4fd8add6700393058549213505 /libs/utils
parentb916f6f17f072f2f95097fd555175956a739ee8f (diff)
parent015b8a66db5bbc1ad092d5562730d90b6a485c1d (diff)
am d1313da5: am eb6e0df1: Don\'t build framework tests for simulator target.
Merge commit 'd1313da5999e06be16e52527cfba443f66b333a1' * commit 'd1313da5999e06be16e52527cfba443f66b333a1': Don't build framework tests for simulator target.
Diffstat (limited to 'libs/utils')
-rw-r--r--libs/utils/tests/Android.mk5
1 files changed, 5 insertions, 0 deletions
diff --git a/libs/utils/tests/Android.mk b/libs/utils/tests/Android.mk
index f1b8cd56ee..b9f206a9d8 100644
--- a/libs/utils/tests/Android.mk
+++ b/libs/utils/tests/Android.mk
@@ -2,6 +2,9 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
+ifneq ($(TARGET_SIMULATOR),true)
+
+# Build the unit tests.
test_src_files := \
ObbFile_test.cpp \
PollLoop_test.cpp
@@ -37,3 +40,5 @@ $(foreach file,$(test_src_files), \
$(eval LOCAL_MODULE_TAGS := $(module_tags)) \
$(eval include $(BUILD_EXECUTABLE)) \
)
+
+endif \ No newline at end of file