From 0000000000000000000000000000000000000000 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                   | 35 +++++++++++++++++++++++
 chrome/android/chrome_public_apk_tmpl.gni |  2 ++
 2 files changed, 37 insertions(+)

diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index 9ef4d7045a0db..40bce15d64f89 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -2430,6 +2430,10 @@ if (current_toolchain == default_toolchain) {
     is_trichrome = true
     is_bundle_module = true
   }
+  resource_packaging("trichrome_chrome_apk_pak_assets") {
+    is_monochrome = false
+    is_trichrome = true
+  }
 
   # Exists separately from chrome_public_base_module_java_for_test to allow
   # downstream to depend on test support packages without needing to depend on
@@ -2796,6 +2800,37 @@ if (current_toolchain == default_toolchain) {
       }
     }
   }
+ 
+  chrome_public_apk_or_module_tmpl("trichrome_chrome_apk") {
+    apk_name = "TrichromeChrome"
+    is_trichrome = true
+    target_type = "android_apk"
+    static_library_provider = ":trichrome_library_apk"
+    if (android_64bit_target_cpu) {
+      is_64_bit_browser = false
+      include_64_bit_webview = true
+    }
+  }
+  
+  if (android_64bit_target_cpu) {
+    chrome_public_apk_or_module_tmpl("trichrome_chrome_64_32_apk") {
+      apk_name = "TrichromeChrome6432"
+      is_trichrome = true
+      target_type = "android_apk"
+      static_library_provider = ":trichrome_library_64_32_apk"
+      is_64_bit_browser = true
+      include_32_bit_webview = true
+    }
+  
+    chrome_public_apk_or_module_tmpl("trichrome_chrome_64_apk") {
+      apk_name = "TrichromeChrome64"
+      is_trichrome = true
+      target_type = "android_apk"
+      static_library_provider = ":trichrome_library_64_apk"
+      is_64_bit_browser = true
+      include_32_bit_webview = false
+    }
+  }
 
   # As compared to chrome_public_test_apk, this target contains only unit tests
   # that require on device capabilities. These tests are smaller, more tightly
diff --git a/chrome/android/chrome_public_apk_tmpl.gni b/chrome/android/chrome_public_apk_tmpl.gni
index 54c50b54bb7ca..1fc91f09297a5 100644
--- a/chrome/android/chrome_public_apk_tmpl.gni
+++ b/chrome/android/chrome_public_apk_tmpl.gni
@@ -454,6 +454,8 @@ template("chrome_common_apk_or_module_tmpl") {
       deps += [ "//chrome/android:chrome_bundle_module_pak_assets" ]
     } else if (_is_monochrome) {
       deps += [ "//chrome/android:monochrome_apk_pak_assets" ]
+    } else if (_is_trichrome) {
+      deps += [ "//chrome/android:trichrome_chrome_apk_pak_assets" ]
     } else {
       assert(!_is_trichrome)
       deps += [ "//chrome/android:chrome_apk_pak_assets" ]