commit 41e034e1a57d3eaa7f50954d0831f4b2e2220502
author Brian Muramatsu <btmura@google.com> Thu Jun 10 15:02:06 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Jun 10 15:02:06 2010 -0700
tree ac9622177c51379a3128f233ff75e42170b607ab
parent 08776fdb3578b35c55e74b63f00162c0b7e9d6e0
parent 83a4a1c6a6afafeddb1b4e38a012dc66b09f3a53

am 83a4a1c6: Don\'t Build Test Requiring cpufeatures for sim-eng

Merge commit '83a4a1c6a6afafeddb1b4e38a012dc66b09f3a53' into kraken

* commit '83a4a1c6a6afafeddb1b4e38a012dc66b09f3a53':
  Don't Build Test Requiring cpufeatures for sim-eng

tests/tests/os/Android.mk

diff --git a/tests/tests/os/Android.mk b/tests/tests/os/Android.mk
index 63c7056..83f5e24 100644
--- a/tests/tests/os/Android.mk
+++ b/tests/tests/os/Android.mk
@@ -23,9 +23,12 @@
 
 LOCAL_JAVA_LIBRARIES := android.test.runner
 
+ifneq ($(TARGET_SIMULATOR),true)
 LOCAL_JNI_SHARED_LIBRARIES := libbuildtest
-
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
+else
+LOCAL_SRC_FILES := $(filter-out %BuildTest.java,$(call all-java-files-under, src))
+endif
 
 LOCAL_PACKAGE_NAME := CtsOsTestCases
 
@@ -36,5 +39,7 @@
 
 include $(BUILD_PACKAGE)
 
+ifneq ($(TARGET_SIMULATOR),true)
 # Include the associated library's makefile.
 include $(LOCAL_PATH)/libbuildtest/Android.mk
+endif