commit 4154b77285ee97186a9d81ef72cbad91f6b8ba0f
author Treehugger Robot <treehugger-gerrit@google.com> Mon Aug 15 22:01:30 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Aug 15 22:01:30 2016 +0000
tree c85baee79559721c3c393f3a4f33cd03f57cd101
parent 63ccb1bdac7b70b59d7f4187919d7b291e1a3f36
parent 46230445172d3cd72c38102d57f5a1b725c80367

Merge "linker: add test for zero shdr offset"

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 0fa32b3..8c9052b 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"