| Index: chrome/android/BUILD.gn
|
| diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
|
| index 14c33737aff3e54a176852891143c7b289f428a1..5bfc65004c926e49a18b819485a81b6c62abe526 100644
|
| --- a/chrome/android/BUILD.gn
|
| +++ b/chrome/android/BUILD.gn
|
| @@ -181,7 +181,6 @@
|
| ":document_tab_model_info_proto_java",
|
| ":partner_location_descriptor_proto_java",
|
| "//base:base_java",
|
| - "//build/android:build_hooks_java",
|
| "//chrome/android/webapk/libs/client:client_java",
|
| "//chrome/android/webapk/libs/common:common_java",
|
| "//chrome/android/webapk/libs/runtime_library:webapk_service_aidl_java",
|
| @@ -734,29 +733,29 @@
|
| "/libmonochrome$shlib_extension.whitelist"
|
| output = monochrome_resource_whitelist
|
| }
|
| -
|
| +
|
| # Use custom resource ID list instead of android_webview's compiler
|
| # resource whitelist because //android_webview: generate_webui_resources
|
| # and //android_webview: generate_components_resources use hand-written
|
| # resource whitelists.
|
| action("system_webview_locale_resource_id_list") {
|
| script = "//tools/grit/pak_util.py"
|
| -
|
| +
|
| _system_webview_en_US_locale_pak =
|
| "$root_out_dir/android_webview/locales/en-US.pak"
|
| -
|
| +
|
| inputs = [
|
| _system_webview_en_US_locale_pak,
|
| ]
|
| -
|
| +
|
| outputs = [
|
| system_webview_locale_resource_id_list,
|
| ]
|
| -
|
| +
|
| deps = [
|
| "//android_webview:repack_locales",
|
| ]
|
| -
|
| +
|
| args = [
|
| "list-id",
|
| "--output",
|
| @@ -764,25 +763,25 @@
|
| rebase_path(_system_webview_en_US_locale_pak, root_build_dir),
|
| ]
|
| }
|
| -
|
| +
|
| action("monochrome_locale_whitelist") {
|
| script = "//tools/resources/filter_resource_whitelist.py"
|
| -
|
| +
|
| inputs = [
|
| monochrome_resource_whitelist,
|
| system_webview_locale_resource_id_list,
|
| ]
|
| -
|
| +
|
| outputs = [
|
| monochrome_locale_whitelist,
|
| ]
|
| -
|
| +
|
| deps = [
|
| ":monochrome_resource_whitelist",
|
| ":system_webview_locale_resource_id_list",
|
| "//android_webview:system_webview_pak_whitelist",
|
| ]
|
| -
|
| +
|
| args = [
|
| "--input",
|
| rebase_path(monochrome_resource_whitelist, root_build_dir),
|
| @@ -791,7 +790,7 @@
|
| "--output",
|
| rebase_path(monochrome_locale_whitelist, root_build_dir),
|
| ]
|
| - }
|
| + }
|
| }
|
|
|
| chrome_paks("monochrome_paks") {
|
| @@ -809,7 +808,7 @@
|
| deps += [ ":monochrome_locale_whitelist" ]
|
| }
|
| }
|
| -
|
| +
|
| # This target is separate from monochrome_pak_assets because it does not
|
| # disable compression.
|
| android_assets("monochrome_locale_pak_assets") {
|
| @@ -817,7 +816,7 @@
|
| foreach(_locale, locales - android_chrome_omitted_locales) {
|
| sources += [ "$target_gen_dir/monochrome_paks/locales/$_locale.pak" ]
|
| }
|
| -
|
| +
|
| deps = [
|
| ":monochrome_paks",
|
| ]
|
|
|