Remove ChromiumMultiDex and androidx-multidex dependency am: 4adde0fd00

Original change: https://android-review.googlesource.com/c/platform/external/cronet/+/2908357

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

4 files changed, 5 insertions, 6 deletions

diff --git a/Android.bp b/Android.bp
index cfeb87f37..1765407d4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -4103,7 +4103,6 @@ java_library {
 java_library {
     name: "cronet_aml_base_base_java_test_support__testing",
     srcs: [
-        "base/test/android/java/src/org/chromium/base/multidex/ChromiumMultiDexInstaller.java",
         "base/test/android/javatests/src/org/chromium/base/test/BaseActivityTestRule.java",
         "base/test/android/javatests/src/org/chromium/base/test/BaseChromiumAndroidJUnitRunner.java",
         "base/test/android/javatests/src/org/chromium/base/test/BaseJUnit4ClassRunner.java",
@@ -4197,7 +4196,6 @@ java_library {
     ],
     min_sdk_version: "30",
     libs: [
-        "android-support-multidex",
         "android.test.base",
         "android.test.mock",
         "androidx.annotation_annotation-nodeps",
diff --git a/android/tools/gn2bp/Android.bp.swp b/android/tools/gn2bp/Android.bp.swp
index cfeb87f37..1765407d4 100644
--- a/android/tools/gn2bp/Android.bp.swp
+++ b/android/tools/gn2bp/Android.bp.swp
@@ -4103,7 +4103,6 @@ java_library {
 java_library {
     name: "cronet_aml_base_base_java_test_support__testing",
     srcs: [
-        "base/test/android/java/src/org/chromium/base/multidex/ChromiumMultiDexInstaller.java",
         "base/test/android/javatests/src/org/chromium/base/test/BaseActivityTestRule.java",
         "base/test/android/javatests/src/org/chromium/base/test/BaseChromiumAndroidJUnitRunner.java",
         "base/test/android/javatests/src/org/chromium/base/test/BaseJUnit4ClassRunner.java",
@@ -4197,7 +4196,6 @@ java_library {
     ],
     min_sdk_version: "30",
     libs: [
-        "android-support-multidex",
         "android.test.base",
         "android.test.mock",
         "androidx.annotation_annotation-nodeps",
diff --git a/android/tools/gn2bp/gen_android_bp b/android/tools/gn2bp/gen_android_bp
index 699f7f9a2..329759da1 100755
--- a/android/tools/gn2bp/gen_android_bp
+++ b/android/tools/gn2bp/gen_android_bp
@@ -292,7 +292,8 @@ def add_android_test_mock_java_deps(module, arch):
   module.libs.add("android.test.mock")
 
 def add_androidx_multidex_java_deps(module, arch):
-  module.libs.add("android-support-multidex")
+  # Androidx-multidex is disabled on unbundled branches.
+  pass
 
 def add_androidx_test_monitor_java_deps(module, arch):
   module.libs.add("androidx.test.monitor")
diff --git a/android/tools/gn2bp/gn_utils.py b/android/tools/gn2bp/gn_utils.py
index 7f778c5bd..9d9167440 100644
--- a/android/tools/gn2bp/gn_utils.py
+++ b/android/tools/gn2bp/gn_utils.py
@@ -49,7 +49,9 @@ JAVA_FILES_TO_IGNORE = (
   "//components/cronet/android/test/javatests/src/org/chromium/net/apihelpers/ContentTypeParametersParserTest.java",
   # Netty does not exist currently in AOSP so those classes won't compile. We replace with stubs.
   "//components/cronet/android/test/src/org/chromium/net/Http2TestHandler.java",
-  "//components/cronet/android/test/src/org/chromium/net/Http2TestServer.java"
+  "//components/cronet/android/test/src/org/chromium/net/Http2TestServer.java",
+  # androidx-multidex is disabled on unbundled branches.
+  "//base/test/android/java/src/org/chromium/base/multidex/ChromiumMultiDexInstaller.java",
 )
 RESPONSE_FILE = '{{response_file_name}}'
 TESTING_SUFFIX = "__testing"