am cabbe91f: Merge "Fix mac SDK builds."
* commit 'cabbe91ffd6615c9b4d76909ec7fc1fb3db19e00':
Fix mac SDK builds.
diff --git a/CtsTestCaseList.mk b/CtsTestCaseList.mk
index dbf82c9..fb9dcf2 100644
--- a/CtsTestCaseList.mk
+++ b/CtsTestCaseList.mk
@@ -139,7 +139,10 @@
cts_native_exes := \
NativeMediaTest_SL \
NativeMediaTest_XA \
- bionic-unit-tests-cts \
+
+ifeq ($(HOST_OS)-$(HOST_ARCH),$(filter $(HOST_OS)-$(HOST_ARCH),linux-x86 linux-x86_64))
+cts_native_exes += bionic-unit-tests-cts
+endif
cts_ui_tests := \
CtsUiAutomatorTests
@@ -164,4 +167,4 @@
# The following files will be placed in the tools directory of the CTS distribution
-CTS_TOOLS_LIST :=
\ No newline at end of file
+CTS_TOOLS_LIST :=
diff --git a/tests/tests/bionic/Android.mk b/tests/tests/bionic/Android.mk
index 89081fc..1a048c6 100644
--- a/tests/tests/bionic/Android.mk
+++ b/tests/tests/bionic/Android.mk
@@ -26,6 +26,7 @@
LOCAL_CTS_TEST_PACKAGE := android.bionic
include $(BUILD_CTS_EXECUTABLE)
+ifeq ($(HOST_OS)-$(HOST_ARCH),$(filter $(HOST_OS)-$(HOST_ARCH),linux-x86 linux-x86_64))
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional
@@ -45,3 +46,4 @@
libBionicTests \
include $(BUILD_HOST_NATIVE_TEST)
+endif # ifeq ($(HOST_OS)-$(HOST_ARCH),$(filter $(HOST_OS)-$(HOST_ARCH),linux-x86 linux-x86_64))