diff options
| author | Patrick Rohr <prohr@google.com> | 2023-09-05 21:59:55 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-09-05 21:59:55 +0000 |
| commit | c71452cac0e4fdc33daf7f743cadb876ad1361e0 (patch) | |
| tree | 3e28d0cc0875bc5b99cb998208c2bcef419bc5dd | |
| parent | d5c662c598c4f501b564e071d9f28c715fb0ccdb (diff) | |
| parent | b71b7b4f3304ac9060a6daed928ca1ec2e8b146e (diff) | |
| download | cronet-c71452cac0e4fdc33daf7f743cadb876ad1361e0.tar.gz | |
Rename libcronet.so to prevent conflict when calling System.loadLibrary() am: 4f7ebec594 am: e1f51a84ad am: b71b7b4f33
Original change: https://android-review.googlesource.com/c/platform/external/cronet/+/2737694
Change-Id: Ia6e2c9785c2223e0e6d032038764d488e0ce7879
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 2 | ||||
| -rw-r--r-- | components/cronet/android/java/src/org/chromium/net/impl/CronetLibraryLoader.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp index 862b6b21f..d4fa2942a 100644 --- a/Android.bp +++ b/Android.bp @@ -6984,7 +6984,7 @@ cc_library_shared { "-Wl,-wrap,valloc", "-Wl,-wrap,vasprintf", ], - stem: "libcronet.114.0.5735.84", + stem: "libmainlinecronet.114.0.5735.84", visibility: [ "//packages/modules/Connectivity:__subpackages__", ], diff --git a/components/cronet/android/java/src/org/chromium/net/impl/CronetLibraryLoader.java b/components/cronet/android/java/src/org/chromium/net/impl/CronetLibraryLoader.java index b2a632927..588f635bc 100644 --- a/components/cronet/android/java/src/org/chromium/net/impl/CronetLibraryLoader.java +++ b/components/cronet/android/java/src/org/chromium/net/impl/CronetLibraryLoader.java @@ -28,7 +28,7 @@ import org.chromium.net.NetworkChangeNotifier; public class CronetLibraryLoader { // Synchronize initialization. private static final Object sLoadLock = new Object(); - private static final String LIBRARY_NAME = "cronet." + ImplVersion.getCronetVersion(); + private static final String LIBRARY_NAME = "mainlinecronet." + ImplVersion.getCronetVersion(); private static final String TAG = CronetLibraryLoader.class.getSimpleName(); // Thread used for initialization work and processing callbacks for // long-lived global singletons. This thread lives forever as things like |