android: Use ModernLinker for TriChromeChrome.

Bug: 979638
Change-Id: I7ea71dbe79489648fe418f439224a2e2fa11a378
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1930737
Commit-Queue: Benoit L <lizeb@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#719146}

chrome/android/chrome_public_apk_tmpl.gni

@@ -400,7 +400,8 @@ template("monochrome_public_common_apk_or_module_tmpl") {
       _pak_prefix = "trichrome_chrome"
     }
 
-    use_chromium_linker = false
+    use_chromium_linker = is_trichrome && chromium_linker_supported
+    use_modern_linker = use_chromium_linker
 
     # Resources config for blocklisting resource names from obfuscation
     resources_config_path = "//android_webview/aapt2.config"

chrome/android/trichrome.gni

@@ -70,7 +70,6 @@ template("trichrome_library_apk_tmpl") {
       r_java_root_package_name = "trichrome_lib"
       app_as_shared_lib = true
     }
-    use_chromium_linker = false
 
     uncompress_shared_libraries = true
     uncompress_dex = true
@@ -131,7 +130,7 @@ template("trichrome_library_apk_tmpl") {
           secondary_abi_loadable_modules =
               [ "$_secondary_out_dir/libcrashpad_handler_trampoline.so" ]
 
-          if (use_chromium_linker) {
+          if (chromium_linker_supported) {
             deps += [ "//base/android/linker:chromium_android_linker($android_secondary_abi_toolchain)" ]
             secondary_abi_loadable_modules +=
                 [ "$_secondary_out_dir/libchromium_android_linker.so" ]
@@ -150,6 +149,11 @@ template("trichrome_library_apk_tmpl") {
           "//third_party/crashpad/crashpad/handler:crashpad_handler_trampoline",
         ]
         loadable_modules = [ "$root_out_dir/libcrashpad_handler_trampoline.so" ]
+
+        if (chromium_linker_supported) {
+          deps += [ "//base/android/linker:chromium_android_linker" ]
+          loadable_modules += [ "$root_out_dir/libchromium_android_linker.so" ]
+        }
       }
     }