commit c0689d0b6c2ff9139c67d097549b2092ab9c46a8
author Jeff Brown <jeffbrown@google.com> Thu Jul 15 10:24:10 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Jul 15 10:24:10 2010 -0700
tree 9462d7239a340e45b6a8a75db5575f2e7a0d63e6
parent 25fd875da6a4a7f8951e0eeae83cacb3abbe01fb
parent d1313da5999e06be16e52527cfba443f66b333a1

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.

libs/ui/tests/Android.mk

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 @@
 
 # Build the manual test programs.
 include $(call all-subdir-makefiles)
+
+endif
\ No newline at end of file

libs/utils/tests/Android.mk

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 @@
     $(eval LOCAL_MODULE_TAGS := $(module_tags)) \
     $(eval include $(BUILD_EXECUTABLE)) \
 )
+
+endif
\ No newline at end of file