diff options
| author | 2022-06-08 16:37:10 +0100 | |
|---|---|---|
| committer | 2022-06-10 13:25:54 +0000 | |
| commit | e631de122b065b014927c08df45258dffca27211 (patch) | |
| tree | 166639123ea97465e77fc2f9d4c9dcc59cff1bca /libnativebridge/tests/NativeBridgeTest.h | |
| parent | b054b2c013d9845089938486efdc7406dfb36d60 (diff) | |
Use compile_multilib: "both" with "32"/"64" suffixes by default for ART
native tests.
It cannot be used for shared testing libraries since the suffixes
aren't picked up by DT_NEEDED or dlopen calls. They need to continue to
be installed into different directories, just like before.
Test: gtests and run tests in the buildbot-build.sh chroot
Test: art/libnativebridge/tests/runtests.sh
Test: atest art_standalone_dex2oat_tests
Bug: 233550842
Change-Id: Idd576f9de34ab63d70e63b8701373767f0bd78ae
Diffstat (limited to 'libnativebridge/tests/NativeBridgeTest.h')
| -rw-r--r-- | libnativebridge/tests/NativeBridgeTest.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/libnativebridge/tests/NativeBridgeTest.h b/libnativebridge/tests/NativeBridgeTest.h index 62509b8917..6b445d0915 100644 --- a/libnativebridge/tests/NativeBridgeTest.h +++ b/libnativebridge/tests/NativeBridgeTest.h @@ -22,12 +22,18 @@ #include <nativebridge/native_bridge.h> #include <gtest/gtest.h> -constexpr const char* kNativeBridgeLibrary = "libnativebridge-test-case.so"; +#if defined(__LP64__) +#define LIB_SUFFIX "64" +#else +#define LIB_SUFFIX "32" +#endif + +constexpr const char* kNativeBridgeLibrary = "libnativebridge-test-case" LIB_SUFFIX ".so"; constexpr const char* kCodeCache = "./code_cache"; constexpr const char* kCodeCacheStatFail = "./code_cache/temp"; -constexpr const char* kNativeBridgeLibrary2 = "libnativebridge2-test-case.so"; -constexpr const char* kNativeBridgeLibrary3 = "libnativebridge3-test-case.so"; -constexpr const char* kNativeBridgeLibrary6 = "libnativebridge6-test-case.so"; +constexpr const char* kNativeBridgeLibrary2 = "libnativebridge2-test-case" LIB_SUFFIX ".so"; +constexpr const char* kNativeBridgeLibrary3 = "libnativebridge3-test-case" LIB_SUFFIX ".so"; +constexpr const char* kNativeBridgeLibrary6 = "libnativebridge6-test-case" LIB_SUFFIX ".so"; namespace android { |