[Android] Rework multidex and enable multidex for unit_tests_apk. (RELAND 2)

this is a reland of https://codereview.chromium.org/1590243003/

BUG=272790
TBR=thakis@chromium.org,yfriedman@chromium.org,phajdan.jr@chromium.org

Review URL: https://codereview.chromium.org/1594653002

Cr-Commit-Position: refs/heads/master@{#369906}

1 files changed, 19 insertions, 2 deletions

diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index da9a853..1c65d21 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -1484,6 +1484,21 @@ template("android_apk") {
     _srcjar_deps += [ ":${_template_name}__native_libraries_java" ]
   }
 
+  if (!defined(invoker.apk_under_test)) {
+    java_cpp_template("${_template_name}__multidex_config_java") {
+      package_name = "org/chromium/base/multidex"
+      sources = [
+        "//base/android/java/templates/ChromiumMultiDex.template",
+      ]
+
+      defines = []
+      if (enable_multidex) {
+        defines += [ "ENABLE_MULTIDEX" ]
+      }
+    }
+    _srcjar_deps += [ ":${_template_name}__multidex_config_java" ]
+  }
+
   java_target = "${_template_name}__java"
   java_library_impl(java_target) {
     forward_variables_from(invoker, [ "run_findbugs" ])
@@ -2018,11 +2033,13 @@ template("unittest_apk") {
     native_libs = [ unittests_binary ]
     deps += [
       "//base:base_java",
-      "//build/android/pylib/remote/device/dummy:remote_device_dummy_apk",
       "//testing/android/appurify_support:appurify_support_java",
       "//testing/android/reporter:reporter_java",
     ]
-    data_deps += [ "//tools/android/md5sum" ]
+    data_deps += [
+      "//build/android/pylib/remote/device/dummy:remote_device_dummy_apk",
+      "//tools/android/md5sum",
+    ]
     if (host_os == "linux") {
       data_deps += [ "//tools/android/forwarder2" ]
     }