commit 50e50d385b111074fa437952c0ad0744a7fdbaff
author Lazar Trsic <Lazar.Trsic@imgtec.com> Mon Aug 15 21:30:26 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Aug 15 21:30:26 2016 +0000
tree a9d6c1b0f39dcf8b9f592dacaf7c7ff9ef317e4d
parent 4a77965d58045b424666d4b9a82e14b691730016
parent ecb70b92c82f17090897c7eee90459f91a6ec972

Merge "[MIPS] Fix bionic test build" am: 63ccb1bdac am: 05d6befe01 am: d6b302458f
am: ecb70b92c8

Change-Id: Ia59b75f9a6e631324ff54a218a9675f056b7cb10

tests/Android.build.prebuilt.mk

diff --git a/tests/Android.build.prebuilt.mk b/tests/Android.build.prebuilt.mk
index 2d12557..09c2366 100644
--- a/tests/Android.build.prebuilt.mk
+++ b/tests/Android.build.prebuilt.mk
@@ -21,6 +21,8 @@
 LOCAL_MODULE_PATH_64 := $(TARGET_OUT_DATA_NATIVE_TESTS)/prebuilt-elf-files
 LOCAL_MODULE_CLASS := EXECUTABLES
 
+LOCAL_MODULE_TARGET_ARCH := arm arm64 x86 x86_64
+
 LOCAL_SRC_FILES_arm := prebuilt-elf-files/arm/$(bionic_tests_module)
 LOCAL_SRC_FILES_arm64 := prebuilt-elf-files/arm64/$(bionic_tests_module)
 LOCAL_SRC_FILES_x86 := prebuilt-elf-files/x86/$(bionic_tests_module)

tests/dlfcn_test.cpp

diff --git a/tests/dlfcn_test.cpp b/tests/dlfcn_test.cpp
index 68827fa..9f1b401 100644
--- a/tests/dlfcn_test.cpp
+++ b/tests/dlfcn_test.cpp
@@ -1144,7 +1144,7 @@
 }
 
 // Bionic specific tests
-#if defined(__BIONIC__)
+#if defined(__BIONIC__) && !defined(__mips__)
 
 #if defined(__LP64__)
 #define NATIVE_TESTS_PATH "/nativetest64"