diff options
| author | Jeff Brown <jeffbrown@google.com> | 2010-07-15 10:21:18 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-15 10:21:18 -0700 |
| commit | d1313da5999e06be16e52527cfba443f66b333a1 (patch) | |
| tree | 196b94ffdbc4fbe6104bfa8cce9e06f57d8be89f | |
| parent | 521e9aa7523220c3dc48f6abd32fad6b76eea114 (diff) | |
| parent | eb6e0df18a6567d38caa039ba0b0e49e2e9b46c3 (diff) | |
| download | frameworks_base-d1313da5999e06be16e52527cfba443f66b333a1.zip frameworks_base-d1313da5999e06be16e52527cfba443f66b333a1.tar.gz frameworks_base-d1313da5999e06be16e52527cfba443f66b333a1.tar.bz2 | |
am eb6e0df1: Don\'t build framework tests for simulator target.
Merge commit 'eb6e0df18a6567d38caa039ba0b0e49e2e9b46c3' into gingerbread-plus-aosp
* commit 'eb6e0df18a6567d38caa039ba0b0e49e2e9b46c3':
Don't build framework tests for simulator target.
| -rw-r--r-- | libs/ui/tests/Android.mk | 5 | ||||
| -rw-r--r-- | libs/utils/tests/Android.mk | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/libs/ui/tests/Android.mk b/libs/ui/tests/Android.mk index 46d7493..62f824f 100644 --- a/libs/ui/tests/Android.mk +++ b/libs/ui/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 := \ InputChannel_test.cpp \ InputDispatcher_test.cpp \ @@ -43,3 +46,5 @@ $(foreach file,$(test_src_files), \ # Build the manual test programs. include $(call all-subdir-makefiles) + +endif
\ No newline at end of file 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 |