commit 739f7b77a558f92e3badaabd240e0247aa4cbcdf
author Patrick Rohr <prohr@google.com> Mon Jan 09 15:08:02 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jan 09 15:08:02 2023 +0000
tree 32486f4479dd0b62013c8c6c6eda0fff80d1ce15
parent ffd932638600a7bd2a602deb29c68833013ab194
parent d42df9593eacfd9b8133f19b346b61e6655a5c6f

Merge changes from topics "2374762-android-bp", "2374763-android-bp" am: d42df9593e

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2374727

Change-Id: I42a42de6a86441b8f60663833a48e071a70875bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

tools/gn2bp/Android.bp.swp

diff --git a/tools/gn2bp/Android.bp.swp b/tools/gn2bp/Android.bp.swp
index af4ed6f..33e6a60 100644
--- a/tools/gn2bp/Android.bp.swp
+++ b/tools/gn2bp/Android.bp.swp
@@ -2716,7 +2716,6 @@
         "components/cronet/android/java/src/org/chromium/net/impl/JavaUploadDataSinkBase.java",
         "components/cronet/android/java/src/org/chromium/net/impl/JavaUrlRequestUtils.java",
         "components/cronet/android/java/src/org/chromium/net/impl/NativeCronetEngineBuilderImpl.java",
-        "components/cronet/android/java/src/org/chromium/net/impl/NativeCronetEngineBuilderWithLibraryLoaderImpl.java",
         "components/cronet/android/java/src/org/chromium/net/impl/NetworkExceptionImpl.java",
         "components/cronet/android/java/src/org/chromium/net/impl/NoOpLogger.java",
         "components/cronet/android/java/src/org/chromium/net/impl/Preconditions.java",
@@ -2984,7 +2983,6 @@
         "components/cronet/android/java/src/org/chromium/net/impl/JavaUploadDataSinkBase.java",
         "components/cronet/android/java/src/org/chromium/net/impl/JavaUrlRequestUtils.java",
         "components/cronet/android/java/src/org/chromium/net/impl/NativeCronetEngineBuilderImpl.java",
-        "components/cronet/android/java/src/org/chromium/net/impl/NativeCronetEngineBuilderWithLibraryLoaderImpl.java",
         "components/cronet/android/java/src/org/chromium/net/impl/NetworkExceptionImpl.java",
         "components/cronet/android/java/src/org/chromium/net/impl/NoOpLogger.java",
         "components/cronet/android/java/src/org/chromium/net/impl/Preconditions.java",
@@ -4358,7 +4356,6 @@
         "components/cronet/android/java/src/org/chromium/net/impl/JavaUploadDataSinkBase.java",
         "components/cronet/android/java/src/org/chromium/net/impl/JavaUrlRequestUtils.java",
         "components/cronet/android/java/src/org/chromium/net/impl/NativeCronetEngineBuilderImpl.java",
-        "components/cronet/android/java/src/org/chromium/net/impl/NativeCronetEngineBuilderWithLibraryLoaderImpl.java",
         "components/cronet/android/java/src/org/chromium/net/impl/NetworkExceptionImpl.java",
         "components/cronet/android/java/src/org/chromium/net/impl/NoOpLogger.java",
         "components/cronet/android/java/src/org/chromium/net/impl/Preconditions.java",

tools/gn2bp/desc_arm.json

diff --git a/tools/gn2bp/desc_arm.json b/tools/gn2bp/desc_arm.json
index 5215278..dcfcd63 100644
--- a/tools/gn2bp/desc_arm.json
+++ b/tools/gn2bp/desc_arm.json
Binary files differ

tools/gn2bp/desc_arm64.json

diff --git a/tools/gn2bp/desc_arm64.json b/tools/gn2bp/desc_arm64.json
index c345602..6a26578 100644
--- a/tools/gn2bp/desc_arm64.json
+++ b/tools/gn2bp/desc_arm64.json
Binary files differ

tools/gn2bp/desc_x64.json

diff --git a/tools/gn2bp/desc_x64.json b/tools/gn2bp/desc_x64.json
index 244666e..f69f50f 100644
--- a/tools/gn2bp/desc_x64.json
+++ b/tools/gn2bp/desc_x64.json
Binary files differ

tools/gn2bp/desc_x86.json

diff --git a/tools/gn2bp/desc_x86.json b/tools/gn2bp/desc_x86.json
index c5e9fc7..4f30229 100644
--- a/tools/gn2bp/desc_x86.json
+++ b/tools/gn2bp/desc_x86.json
Binary files differ