Merge "[MIPS] Fix bionic test build"

am: 63ccb1bdac

Change-Id: If68781a1ed2d6fe22b8128e82c9d8a227d3cc444
This commit is contained in:
Lazar Trsic 2016-08-15 21:13:22 +00:00 committed by android-build-merger
commit 05d6befe01
2 changed files with 3 additions and 1 deletions

View file

@ -21,6 +21,8 @@ LOCAL_MODULE_PATH_32 := $($(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_DATA_NATIVE_TE
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)

View file

@ -1144,7 +1144,7 @@ TEST(dlfcn, dt_runpath_absolute_path) {
}
// Bionic specific tests
#if defined(__BIONIC__)
#if defined(__BIONIC__) && !defined(__mips__)
#if defined(__LP64__)
#define NATIVE_TESTS_PATH "/nativetest64"