diff options
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 |
commit | c0689d0b6c2ff9139c67d097549b2092ab9c46a8 (patch) | |
tree | 9462d7239a340e45b6a8a75db5575f2e7a0d63e6 /libs/utils | |
parent | 25fd875da6a4a7f8951e0eeae83cacb3abbe01fb (diff) | |
parent | d1313da5999e06be16e52527cfba443f66b333a1 (diff) | |
download | frameworks_base-c0689d0b6c2ff9139c67d097549b2092ab9c46a8.zip frameworks_base-c0689d0b6c2ff9139c67d097549b2092ab9c46a8.tar.gz frameworks_base-c0689d0b6c2ff9139c67d097549b2092ab9c46a8.tar.bz2 |
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.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libs/utils/tests/Android.mk b/libs/utils/tests/Android.mk index f1b8cd5..b9f206a 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 |