| 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 a7d27041a8d77..ef1aa2682cf62 100644 |
| --- a/chrome/android/BUILD.gn |
| +++ b/chrome/android/BUILD.gn |
| @@ -2470,6 +2470,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 |
| @@ -2843,6 +2847,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 fd6e0d5513e5c..7da69860df6c2 100644 |
| --- a/chrome/android/chrome_public_apk_tmpl.gni |
| +++ b/chrome/android/chrome_public_apk_tmpl.gni |
| @@ -475,6 +475,8 @@ template("chrome_common_apk_or_module_tmpl") { |
| asset_deps += [ "//chrome/android:chrome_bundle_module_pak_assets" ] |
| } else if (_is_monochrome) { |
| asset_deps += [ "//chrome/android:monochrome_apk_pak_assets" ] |
| + } else if (_is_trichrome) { |
| + asset_deps += [ "//chrome/android:trichrome_chrome_apk_pak_assets" ] |
| } else { |
| assert(!_is_trichrome) |
| asset_deps += [ "//chrome/android:chrome_apk_pak_assets" ] |