0

weblayer: sets webview_includes_weblayer to false

I'm in the process of removing weblayer. The bots are no longer
building any of the tests, but because webview binary includes
weblayer, the code is still built. This sets
webview_includes_weblayer to false so that weblayer is no longer
built.

Setting webview_includes_weblayer to false exposes some other
random build issues, which are fixed here as well.

Also, as webview no longer includes weblayer I also had to update
binary expectation files.

Bug: 1471446

Change-Id: I5325a9280e3c9860103538846c08a690054e6bd6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4759226
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Bo Liu <boliu@chromium.org>
Commit-Queue: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1181729}
This commit is contained in:
Scott Violet
2023-08-09 22:08:15 +00:00
committed by Chromium LUCI CQ
parent 3a150c1007
commit bfe078ba02
5 changed files with 33 additions and 110 deletions

@ -1085,27 +1085,29 @@ grit("generate_components_resources") {
}
}
grit("generate_components_scaled_resources") {
source = "../components/resources/components_scaled_resources.grd"
if (webview_includes_weblayer) {
grit("generate_components_scaled_resources") {
source = "../components/resources/components_scaled_resources.grd"
# See :generate_webui_resources for an explanation of the allowlist
_allowlist = rebase_path("$target_gen_dir/grit_resources_allowlist.txt",
root_build_dir)
# See :generate_webui_resources for an explanation of the allowlist
_allowlist = rebase_path("$target_gen_dir/grit_resources_allowlist.txt",
root_build_dir)
grit_flags = [
"-w",
_allowlist,
]
outputs = [
"grit/components_scaled_resources.h",
"grit/components_scaled_resources_map.cc",
"grit/components_scaled_resources_map.h",
"components_resources_100_percent.pak",
"components_resources_200_percent.pak",
"components_resources_300_percent.pak",
]
grit_flags = [
"-w",
_allowlist,
]
outputs = [
"grit/components_scaled_resources.h",
"grit/components_scaled_resources_map.cc",
"grit/components_scaled_resources_map.h",
"components_resources_100_percent.pak",
"components_resources_200_percent.pak",
"components_resources_300_percent.pak",
]
deps = [ ":concatenate_resources_allowlists" ]
deps = [ ":concatenate_resources_allowlists" ]
}
}
grit("generate_components_strings") {

@ -1,85 +1,4 @@
apk_path=assets/chrome_100_percent.pak, compress=False, alignment=4
apk_path=assets/locales/af.pak, compress=False, alignment=4
apk_path=assets/locales/am.pak, compress=False, alignment=4
apk_path=assets/locales/ar.pak, compress=False, alignment=4
apk_path=assets/locales/as.pak, compress=False, alignment=4
apk_path=assets/locales/az.pak, compress=False, alignment=4
apk_path=assets/locales/be.pak, compress=False, alignment=4
apk_path=assets/locales/bg.pak, compress=False, alignment=4
apk_path=assets/locales/bn.pak, compress=False, alignment=4
apk_path=assets/locales/bs.pak, compress=False, alignment=4
apk_path=assets/locales/ca.pak, compress=False, alignment=4
apk_path=assets/locales/cs.pak, compress=False, alignment=4
apk_path=assets/locales/da.pak, compress=False, alignment=4
apk_path=assets/locales/de.pak, compress=False, alignment=4
apk_path=assets/locales/el.pak, compress=False, alignment=4
apk_path=assets/locales/en-GB.pak, compress=False, alignment=4
apk_path=assets/locales/en-US.pak, compress=False, alignment=4
apk_path=assets/locales/es-419.pak, compress=False, alignment=4
apk_path=assets/locales/es.pak, compress=False, alignment=4
apk_path=assets/locales/et.pak, compress=False, alignment=4
apk_path=assets/locales/eu.pak, compress=False, alignment=4
apk_path=assets/locales/fa.pak, compress=False, alignment=4
apk_path=assets/locales/fi.pak, compress=False, alignment=4
apk_path=assets/locales/fil.pak, compress=False, alignment=4
apk_path=assets/locales/fr-CA.pak, compress=False, alignment=4
apk_path=assets/locales/fr.pak, compress=False, alignment=4
apk_path=assets/locales/gl.pak, compress=False, alignment=4
apk_path=assets/locales/gu.pak, compress=False, alignment=4
apk_path=assets/locales/he.pak, compress=False, alignment=4
apk_path=assets/locales/hi.pak, compress=False, alignment=4
apk_path=assets/locales/hr.pak, compress=False, alignment=4
apk_path=assets/locales/hu.pak, compress=False, alignment=4
apk_path=assets/locales/hy.pak, compress=False, alignment=4
apk_path=assets/locales/id.pak, compress=False, alignment=4
apk_path=assets/locales/is.pak, compress=False, alignment=4
apk_path=assets/locales/it.pak, compress=False, alignment=4
apk_path=assets/locales/ja.pak, compress=False, alignment=4
apk_path=assets/locales/ka.pak, compress=False, alignment=4
apk_path=assets/locales/kk.pak, compress=False, alignment=4
apk_path=assets/locales/km.pak, compress=False, alignment=4
apk_path=assets/locales/kn.pak, compress=False, alignment=4
apk_path=assets/locales/ko.pak, compress=False, alignment=4
apk_path=assets/locales/ky.pak, compress=False, alignment=4
apk_path=assets/locales/lo.pak, compress=False, alignment=4
apk_path=assets/locales/lt.pak, compress=False, alignment=4
apk_path=assets/locales/lv.pak, compress=False, alignment=4
apk_path=assets/locales/mk.pak, compress=False, alignment=4
apk_path=assets/locales/ml.pak, compress=False, alignment=4
apk_path=assets/locales/mn.pak, compress=False, alignment=4
apk_path=assets/locales/mr.pak, compress=False, alignment=4
apk_path=assets/locales/ms.pak, compress=False, alignment=4
apk_path=assets/locales/my.pak, compress=False, alignment=4
apk_path=assets/locales/nb.pak, compress=False, alignment=4
apk_path=assets/locales/ne.pak, compress=False, alignment=4
apk_path=assets/locales/nl.pak, compress=False, alignment=4
apk_path=assets/locales/or.pak, compress=False, alignment=4
apk_path=assets/locales/pa.pak, compress=False, alignment=4
apk_path=assets/locales/pl.pak, compress=False, alignment=4
apk_path=assets/locales/pt-BR.pak, compress=False, alignment=4
apk_path=assets/locales/pt-PT.pak, compress=False, alignment=4
apk_path=assets/locales/ro.pak, compress=False, alignment=4
apk_path=assets/locales/ru.pak, compress=False, alignment=4
apk_path=assets/locales/si.pak, compress=False, alignment=4
apk_path=assets/locales/sk.pak, compress=False, alignment=4
apk_path=assets/locales/sl.pak, compress=False, alignment=4
apk_path=assets/locales/sq.pak, compress=False, alignment=4
apk_path=assets/locales/sr-Latn.pak, compress=False, alignment=4
apk_path=assets/locales/sr.pak, compress=False, alignment=4
apk_path=assets/locales/sv.pak, compress=False, alignment=4
apk_path=assets/locales/sw.pak, compress=False, alignment=4
apk_path=assets/locales/ta.pak, compress=False, alignment=4
apk_path=assets/locales/te.pak, compress=False, alignment=4
apk_path=assets/locales/th.pak, compress=False, alignment=4
apk_path=assets/locales/tr.pak, compress=False, alignment=4
apk_path=assets/locales/uk.pak, compress=False, alignment=4
apk_path=assets/locales/ur.pak, compress=False, alignment=4
apk_path=assets/locales/uz.pak, compress=False, alignment=4
apk_path=assets/locales/vi.pak, compress=False, alignment=4
apk_path=assets/locales/zh-CN.pak, compress=False, alignment=4
apk_path=assets/locales/zh-HK.pak, compress=False, alignment=4
apk_path=assets/locales/zh-TW.pak, compress=False, alignment=4
apk_path=assets/locales/zu.pak, compress=False, alignment=4
apk_path=assets/resources.pak, compress=False, alignment=4
apk_path=assets/stored-locales/af.pak, compress=False, alignment=4
apk_path=assets/stored-locales/am.pak, compress=False, alignment=4

@ -10,19 +10,20 @@ import("//weblayer/variables.gni")
template("system_webview_bundle") {
_is_trichrome = defined(invoker.is_trichrome) && invoker.is_trichrome
_base_target_name = get_label_info(invoker.base_module_target, "name")
_base_target_gen_dir =
get_label_info(invoker.base_module_target, "target_gen_dir")
_base_module_build_config =
"$_base_target_gen_dir/${_base_target_name}.build_config.json"
_rebased_base_module_build_config =
rebase_path(_base_module_build_config, root_build_dir)
_base_module_version_code =
"@FileArg($_rebased_base_module_build_config:deps_info:version_code)"
assert(_is_trichrome == defined(invoker.static_library_provider))
if (webview_includes_weblayer) {
_base_target_name = get_label_info(invoker.base_module_target, "name")
_base_target_gen_dir =
get_label_info(invoker.base_module_target, "target_gen_dir")
_base_module_build_config =
"$_base_target_gen_dir/${_base_target_name}.build_config.json"
_rebased_base_module_build_config =
rebase_path(_base_module_build_config, root_build_dir)
_base_module_version_code =
"@FileArg($_rebased_base_module_build_config:deps_info:version_code)"
# TODO(crbug.com/1105096): If WebView starts using
# //components/module_installer, it will probably make sense to refactor
# chrome_feature_module() to be used here.

@ -4993,9 +4993,9 @@ if (enable_java_templates && is_android) {
_module_target = _module.module_target
_module_build_config = _module.build_config
_module_build_config_target = _module.build_config_target
_module_target_name = get_label_info(_module_target, "name")
if (!_proguard_enabled) {
_module_target_name = get_label_info(_module_target, "name")
_dex_target = "${_module_target_name}__final_dex"
_dex_path = "$target_out_dir/$_module_target_name/$_module_target_name.mergeddex.jar"
dex(_dex_target) {
@ -5017,6 +5017,7 @@ if (enable_java_templates && is_android) {
_dex_target_for_module = ":$_dex_target"
if (_enable_art_profile_optimizations && _include_baseline_profile) {
_module_target_name = get_label_info(_module_target, "name")
_binary_profile_target =
"${_module_target_name}__binary_baseline_profile"
_binary_baseline_profile_path = "$target_out_dir/$_module_target_name/$_module_target_name.baseline.prof"

@ -6,7 +6,7 @@ import("//build/config/android/channel.gni")
declare_args() {
# Include the //weblayer code in WebView implementation APKs.
webview_includes_weblayer = true
webview_includes_weblayer = false
}
weblayer_product_config_java_package = "org.chromium.weblayer_private"