build-chromium/patches/0064-add-trichrome-browser-apk-targets.patch

From 2f2f6a0b0663bec5ae7acd722338d2544b1c7457 Mon Sep 17 00:00:00 2001
From: Daniel Micay <danielmicay@gmail.com>
Date: Thu, 27 May 2021 07:30:02 -0400
Subject: [PATCH] add trichrome browser apk targets

---
 chrome/android/BUILD.gn | 61 ++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 60 insertions(+), 1 deletion(-)

diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index 7934ab9348808..17af636d2d7ab 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -2359,6 +2359,10 @@ if (current_toolchain == default_toolchain) {
     is_monochrome = true
     is_bundle_module = true
   }
+  resource_packaging("trichrome_chrome_apk_pak_assets") {
+    is_monochrome = false
+    is_trichrome = true
+  }
   resource_packaging("trichrome_chrome_bundle_module_pak_assets") {
     is_monochrome = false
     is_trichrome = true
@@ -2899,7 +2903,7 @@ if (current_toolchain == default_toolchain) {
 
       if (trichrome_synchronized_proguard) {
         webview_target = "//android_webview:trichrome_webview_apk"
-        chrome_target = ":trichrome_chrome_bundle"
+        chrome_target = ":trichrome_chrome_apk"
       }
 
       if (_enable_manifest_verification) {
@@ -2954,6 +2958,61 @@ if (current_toolchain == default_toolchain) {
       }
     }
   }
+ 
+monochrome_public_apk_or_module_tmpl("trichrome_chrome_apk") {
+  version_code = trichrome_version_code
+  version_name = chrome_version_name
+  apk_name = "TrichromeChrome"
+  target_type = "android_apk"
+  use_trichrome_library = true
+  static_library_provider = ":trichrome_library_apk"
+  if (!is_java_debug) {
+    static_library_synchronized_proguard = trichrome_synchronized_proguard
+    if (trichrome_synchronized_proguard) {
+      resource_ids_provider_dep = "//android_webview:trichrome_webview_apk"
+    }
+  }
+  if (android_64bit_target_cpu) {
+    is_64_bit_browser = false
+    include_64_bit_webview = true
+  }
+}
+
+if (android_64bit_target_cpu) {
+  monochrome_public_apk_or_module_tmpl("trichrome_chrome_64_32_apk") {
+    version_code = trichrome_version_code
+    version_name = chrome_version_name
+    apk_name = "TrichromeChrome6432"
+    target_type = "android_apk"
+    use_trichrome_library = true
+    static_library_provider = ":trichrome_library_64_32_apk"
+    if (!is_java_debug) {
+      static_library_synchronized_proguard = trichrome_synchronized_proguard
+      if (trichrome_synchronized_proguard) {
+        resource_ids_provider_dep = "//android_webview:trichrome_webview_apk"
+      }
+    }
+    is_64_bit_browser = true
+    include_32_bit_webview = true
+  }
+
+  monochrome_public_apk_or_module_tmpl("trichrome_chrome_64_apk") {
+    version_code = trichrome_version_code
+    version_name = chrome_version_name
+    apk_name = "TrichromeChrome64"
+    target_type = "android_apk"
+    use_trichrome_library = true
+    static_library_provider = ":trichrome_library_64_apk"
+    if (!is_java_debug) {
+      static_library_synchronized_proguard = trichrome_synchronized_proguard
+      if (trichrome_synchronized_proguard) {
+        resource_ids_provider_dep = "//android_webview:trichrome_webview_apk"
+      }
+    }
+    is_64_bit_browser = true
+    include_32_bit_webview = false
+  }
+}
 
   chrome_public_unit_test_apk_manifest =
       "$root_gen_dir/chrome_public_unit_test_apk_manifest/AndroidManifest.xml"