diff options
| author | 2022-06-10 16:35:41 +0000 | |
|---|---|---|
| committer | 2022-06-10 19:10:09 +0000 | |
| commit | 9e3649ea669ed3bb8f4e3156d35639228c9cc1bb (patch) | |
| tree | 96ad30d1e91f5f1473a4a9e545e421787c0b0fef /libnativebridge/tests/NativeBridgeTest.h | |
| parent | ce0e1b0b96b24678c6ce7b45a445d428848067bb (diff) | |
Revert "Use compile_multilib: "both" with "32"/"64" suffixes by default for ART"
This reverts commit e631de122b065b014927c08df45258dffca27211.
Bug: 233550842
Reason for revert: Fails nativebridge test:
####################
#################### stderr diffs
--- expected-stderr.txt 2008-01-01 00:00:00.000000000 -0800
+++ test-stderr.txt 2022-06-10 07:15:02.074448940 -0700
@@ -0,0 +1,5 @@
+Exception in thread "main" java.lang.UnsatisfiedLinkError: /b/s/w/ir/x/t/test-art-js9t0vr2/tmpf1x6axa7/libarttestd.so: file too short
+ at java.lang.Runtime.loadLibrary0(Runtime.java:1077)
+ at java.lang.Runtime.loadLibrary0(Runtime.java:998)
+ at java.lang.System.loadLibrary(System.java:1661)
+ at NativeBridgeMain.main(NativeBridgeMain.java:211)
####################
115-native-bridge files deleted from host
----------
test-art-host-run-test-debug-prebuild-optimizing-no-relocate-ntrace-cms-checkjni-picimage-ndebuggable-no-jvmti-cdex-fast-115-native-bridge64
Change-Id: Ib5182fc50dc94d34f314297d0bcc0fa44cd04f61
Diffstat (limited to 'libnativebridge/tests/NativeBridgeTest.h')
| -rw-r--r-- | libnativebridge/tests/NativeBridgeTest.h | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/libnativebridge/tests/NativeBridgeTest.h b/libnativebridge/tests/NativeBridgeTest.h index 6b445d0915..62509b8917 100644 --- a/libnativebridge/tests/NativeBridgeTest.h +++ b/libnativebridge/tests/NativeBridgeTest.h @@ -22,18 +22,12 @@ #include <nativebridge/native_bridge.h> #include <gtest/gtest.h> -#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* kNativeBridgeLibrary = "libnativebridge-test-case.so"; constexpr const char* kCodeCache = "./code_cache"; constexpr const char* kCodeCacheStatFail = "./code_cache/temp"; -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"; +constexpr const char* kNativeBridgeLibrary2 = "libnativebridge2-test-case.so"; +constexpr const char* kNativeBridgeLibrary3 = "libnativebridge3-test-case.so"; +constexpr const char* kNativeBridgeLibrary6 = "libnativebridge6-test-case.so"; namespace android { |