From e631de122b065b014927c08df45258dffca27211 Mon Sep 17 00:00:00 2001 From: Martin Stjernholm Date: Wed, 8 Jun 2022 16:37:10 +0100 Subject: 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 --- libnativebridge/tests/Android.bp | 14 -------------- libnativebridge/tests/NativeBridgeTest.h | 14 ++++++++++---- 2 files changed, 10 insertions(+), 18 deletions(-) (limited to 'libnativebridge/tests') diff --git a/libnativebridge/tests/Android.bp b/libnativebridge/tests/Android.bp index b787fbabb6..a42f3d9b4c 100644 --- a/libnativebridge/tests/Android.bp +++ b/libnativebridge/tests/Android.bp @@ -172,20 +172,6 @@ cc_test { ], header_libs: ["libbase_headers"], - // Support multilib variants (using different suffix per sub-architecture), - // which is needed on build targets with secondary architectures, as the CTS - // test suite packaging logic flattens all test artifacts into a single - // `testcases` directory. - compile_multilib: "both", - multilib: { - lib32: { - suffix: "32", - }, - lib64: { - suffix: "64", - }, - }, - test_config_template: ":art-gtests-target-standalone-cts-template", test_suites: [ "cts", 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 #include -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 { -- cgit v1.2.3-59-g8ed1b