diff options
| author | Brian Muramatsu <btmura@google.com> | 2010-06-10 14:29:28 -0700 |
|---|---|---|
| committer | Brian Muramatsu <btmura@google.com> | 2010-06-10 14:43:10 -0700 |
| commit | 83a4a1c6a6afafeddb1b4e38a012dc66b09f3a53 (patch) | |
| tree | 88c116eec8a56c050cb10c5adc8dfad284081e8b | |
| parent | 42212879c592798ac2bb858cb316d9fc66b28526 (diff) | |
| download | cts-83a4a1c6a6afafeddb1b4e38a012dc66b09f3a53.tar.gz | |
Don't Build Test Requiring cpufeatures for sim-engandroid-sdk-2.2_r2android-2.2_r1.2android-2.2_r1.1android-2.2_r1
Bug 2713199
...to fix the build ...AGAIN
Change-Id: I132fa137bd7226144708d3f788303dfb86f35eb4
| -rw-r--r-- | tests/tests/os/Android.mk | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/tests/os/Android.mk b/tests/tests/os/Android.mk index 63c7056ec17..83f5e24a7e1 100644 --- a/tests/tests/os/Android.mk +++ b/tests/tests/os/Android.mk @@ -23,9 +23,12 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) 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 @@ LOCAL_INSTRUMENTATION_FOR := CtsTestStubs include $(BUILD_PACKAGE) +ifneq ($(TARGET_SIMULATOR),true) # Include the associated library's makefile. include $(LOCAL_PATH)/libbuildtest/Android.mk +endif |