0

Remove refs to Grit's output_all_resource_defines option, part 1.

In this part updating files that are either owned by everyone or I
have ownership.

This option is no longer respected by Grit, as of crrev.com/c/786121
(~7 years ago), but it is still present in a lot of grd files.

Bug: 389466679
Change-Id: I50608a355313dcb2adb372b01b1d6cbd9a7aaf12
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6170774
Auto-Submit: Demetrios Papadopoulos <dpapad@chromium.org>
Commit-Queue: Demetrios Papadopoulos <dpapad@chromium.org>
Reviewed-by: Rebekah Potter <rbpotter@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1405965}
This commit is contained in:
dpapad
2025-01-14 01:29:31 -08:00
committed by Chromium LUCI CQ
parent ed8fb91ca1
commit bfad4d4376
57 changed files with 57 additions and 63 deletions
ash
chrome
chromeos
components
content
docs
ios/chrome/app/strings
tools/grit/grit/testdata
ui

@ -14,7 +14,7 @@ Style notes:
-->
<grit base_dir="." latest_public_release="0" current_release="1"
output_all_resource_defines="false" source_lang_id="en" enc_check="möl">
source_lang_id="en" enc_check="möl">
<outputs>
<output filename="grit/ash_strings.h" type="rc_header">
<emit emit_type='prepend'></emit>

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<grit current_release="1" latest_public_release="0" output_all_resource_defines="false">
<grit current_release="1" latest_public_release="0">
<outputs>
<output filename="grit/chromeos_boca_app_bundle_resources.h" type="rc_header">
<emit emit_type="prepend"/>

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<grit base_dir="." current_release="1" latest_public_release="0"
output_all_resource_defines="false" enc_check="möl" source_lang_id="en">
enc_check="möl" source_lang_id="en">
<outputs>
<output filename="grit/ash_camera_app_strings.h" type="rc_header">
<emit emit_type='prepend'></emit>

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<grit current_release="1" latest_public_release="0" output_all_resource_defines="false">
<grit current_release="1" latest_public_release="0">
<outputs>
<output filename="grit/ash_eche_bundle_resources.h" type="rc_header">
<emit emit_type="prepend"/>

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<grit latest_public_release="0" current_release="1" output_all_resource_defines="false">
<grit latest_public_release="0" current_release="1">
<outputs>
<output filename="grit/ash_focus_mode_resources.h" type="rc_header">
<emit emit_type='prepend'></emit>

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<grit latest_public_release="0" current_release="1" output_all_resource_defines="false">
<grit latest_public_release="0" current_release="1">
<outputs>
<output filename="grit/ash_help_app_resources.h" type="rc_header">
<emit emit_type="prepend"></emit>

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<grit current_release="1" latest_public_release="0" output_all_resource_defines="false">
<grit current_release="1" latest_public_release="0">
<outputs>
<output filename="grit/chromeos_help_app_bundle_resources.h" type="rc_header">
<emit emit_type="prepend"/>

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<grit current_release="1" latest_public_release="0" output_all_resource_defines="false">
<grit current_release="1" latest_public_release="0">
<outputs>
<output filename="grit/chromeos_help_app_kids_magazine_bundle_resources.h" type="rc_header">
<emit emit_type="prepend"/>

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<grit latest_public_release="0" current_release="1" output_all_resource_defines="false">
<grit latest_public_release="0" current_release="1">
<outputs>
<output filename="grit/ash_media_app_resources.h" type="rc_header">
<emit emit_type='prepend'></emit>

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<grit current_release="1" latest_public_release="0" output_all_resource_defines="false">
<grit current_release="1" latest_public_release="0">
<outputs>
<output filename="grit/chromeos_media_app_bundle_resources.h" type="rc_header">
<emit emit_type="prepend"/>

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<grit latest_public_release="0" current_release="1" output_all_resource_defines="false">
<grit latest_public_release="0" current_release="1">
<outputs>
<output filename="grit/ash_multidevice_debug_resources.h" type="rc_header">
<emit emit_type='prepend'></emit>

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<grit current_release="1" latest_public_release="0" output_all_resource_defines="false">
<grit current_release="1" latest_public_release="0">
<outputs>
<output filename="grit/chromeos_projector_app_bundle_resources.h" type="rc_header">
<emit emit_type="prepend"/>

@ -3,7 +3,7 @@
If you update this file, be sure also to update google_chrome_strings.grd. -->
<grit base_dir="." latest_public_release="0" current_release="1"
output_all_resource_defines="false" source_lang_id="en" enc_check="möl">
source_lang_id="en" enc_check="möl">
<outputs>
<output filename="grit/branded_strings.h" type="rc_header">
<emit emit_type='prepend'></emit>

@ -8,7 +8,7 @@ are declared in tools/grit/grit_args.gni.
-->
<grit base_dir="." latest_public_release="0" current_release="1"
output_all_resource_defines="false" source_lang_id="en" enc_check="möl">
source_lang_id="en" enc_check="möl">
<outputs>
<output filename="grit/generated_resources.h" type="rc_header">
<emit emit_type='prepend'></emit>

@ -5,7 +5,7 @@ Chrome supports. If you update this file, be sure also to update
chromium_strings.grd. -->
<grit base_dir="." latest_public_release="0" current_release="1"
output_all_resource_defines="false" source_lang_id="en" enc_check="möl">
source_lang_id="en" enc_check="möl">
<outputs>
<output filename="grit/branded_strings.h" type="rc_header">
<emit emit_type='prepend'></emit>

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<grit latest_public_release="0" current_release="1" output_all_resource_defines="false">
<grit latest_public_release="0" current_release="1">
<outputs>
<output filename="grit/locale_settings.h" type="rc_header">
<emit emit_type='prepend'></emit>

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<grit latest_public_release="0" current_release="1" output_all_resource_defines="false">
<grit latest_public_release="0" current_release="1">
<outputs>
<output filename="grit/platform_locale_settings.h" type="rc_header">
<emit emit_type='prepend'></emit>

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<grit latest_public_release="0" current_release="1" output_all_resource_defines="false">
<grit latest_public_release="0" current_release="1">
<outputs>
<output filename="grit/platform_locale_settings.h" type="rc_header">
<emit emit_type='prepend'></emit>

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<grit latest_public_release="0" current_release="1" output_all_resource_defines="false">
<grit latest_public_release="0" current_release="1">
<outputs>
<output filename="grit/platform_locale_settings.h" type="rc_header">
<emit emit_type='prepend'></emit>

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<grit latest_public_release="0" current_release="1" output_all_resource_defines="false">
<grit latest_public_release="0" current_release="1">
<outputs>
<output filename="grit/platform_locale_settings.h" type="rc_header">
<emit emit_type='prepend'></emit>

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<grit latest_public_release="0" current_release="1" output_all_resource_defines="false">
<grit latest_public_release="0" current_release="1">
<outputs>
<output filename="grit/platform_locale_settings.h" type="rc_header">
<emit emit_type='prepend'></emit>

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<grit latest_public_release="0" current_release="1" output_all_resource_defines="false">
<grit latest_public_release="0" current_release="1">
<outputs>
<output filename="grit/browser_resources.h" type="rc_header">
<emit emit_type='prepend'></emit>

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<grit base_dir="." current_release="1" latest_public_release="0"
output_all_resource_defines="false" enc_check="möl" source_lang_id="en">
enc_check="möl" source_lang_id="en">
<outputs>
<output filename="_locales/af/messages.json.gz" type="chrome_messages_json_gzip" lang="af"/>
<output filename="_locales/am/messages.json.gz" type="chrome_messages_json_gzip" lang="am"/>

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<grit latest_public_release="0" current_release="1" output_all_resource_defines="false">
<grit latest_public_release="0" current_release="1">
<outputs>
<output filename="grit/app_icon_resources.h" type="rc_header" context="default_100_percent">
<emit emit_type='prepend'></emit>

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<grit base_dir="." current_release="1" latest_public_release="0"
output_all_resource_defines="false" enc_check="möl" source_lang_id="en">
enc_check="möl" source_lang_id="en">
<outputs>
<output filename="_locales/af/messages.json.gz" type="chrome_messages_json_gzip" lang="af"/>
<output filename="_locales/am/messages.json.gz" type="chrome_messages_json_gzip" lang="am"/>

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<grit latest_public_release="0" current_release="1" output_all_resource_defines="false">
<grit latest_public_release="0" current_release="1">
<outputs>
<output filename="grit/chromeos_app_icon_resources.h" type="rc_header" context="default_100_percent">
<emit emit_type='prepend'></emit>

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<grit latest_public_release="0" current_release="1" output_all_resource_defines="false">
<grit latest_public_release="0" current_release="1">
<outputs>
<output filename="grit/orca_resources.h" type="rc_header">
<emit emit_type='prepend'></emit>

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<grit latest_public_release="0" current_release="1" output_all_resource_defines="false">
<grit latest_public_release="0" current_release="1">
<outputs>
<output filename="grit/seal_resources.h" type="rc_header">
<emit emit_type='prepend'></emit>

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- This comment is only here because changes to resources are not picked up
without changes to the corresponding grd file. -->
<grit latest_public_release="0" current_release="1" output_all_resource_defines="false">
<grit latest_public_release="0" current_release="1">
<outputs>
<output filename="grit/component_extension_resources.h" type="rc_header">
<emit emit_type='prepend'></emit>

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<grit latest_public_release="0" current_release="1" output_all_resource_defines="false">
<grit latest_public_release="0" current_release="1">
<outputs>
<output filename="grit/office_web_app_resources.h" type="rc_header">
<emit emit_type='prepend'></emit>

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<grit latest_public_release="0" current_release="1" output_all_resource_defines="false">
<grit latest_public_release="0" current_release="1">
<outputs>
<output filename="grit/preinstalled_web_apps_resources.h" type="rc_header">
<emit emit_type='prepend'></emit>

@ -30,7 +30,7 @@ CHAR_LIMIT guidelines:
* Action bar items - 32 characters
-->
<grit current_release="1" latest_public_release="0" output_all_resource_defines="false">
<grit current_release="1" latest_public_release="0">
<outputs>
<output filename="values-af/android_chrome_strings.xml" lang="af" type="android" />
<output filename="values-am/android_chrome_strings.xml" lang="am" type="android" />

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<grit latest_public_release="0" current_release="1" output_all_resource_defines="false">
<grit latest_public_release="0" current_release="1">
<outputs>
<output filename="grit/renderer_resources.h" type="rc_header" context="default_100_percent">
<emit emit_type='prepend'></emit>

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<grit base_dir="." latest_public_release="0" current_release="1"
output_all_resource_defines="false" source_lang_id="en" enc_check="möl">
source_lang_id="en" enc_check="möl">
<outputs>
<output filename="grit/chromeos_strings.h" type="rc_header">
<emit emit_type='prepend'></emit>

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<grit latest_public_release="0" current_release="1"
output_all_resource_defines="false" source_lang_id="en" enc_check="möl">
source_lang_id="en" enc_check="möl">
<outputs>
<output filename="values-af/browser_ui_strings.xml" lang="af" type="android" />
<output filename="values-am/browser_ui_strings.xml" lang="am" type="android" />

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<grit latest_public_release="0" current_release="1" output_all_resource_defines="false">
<grit latest_public_release="0" current_release="1">
<outputs>
<output filename="grit/named_message_port_connector_resources.h" type="rc_header">
<emit emit_type='prepend'></emit>

@ -4,7 +4,7 @@ This file aggregates resource GRDPs for user-facing features under /components.
Resources for developer-facing chrome:// pages should be aggregated in
dev_ui_components_resources.grd.
-->
<grit latest_public_release="0" current_release="1" output_all_resource_defines="false">
<grit latest_public_release="0" current_release="1">
<outputs>
<output filename="grit/components_resources.h" type="rc_header">
<emit emit_type='prepend'></emit>

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<grit latest_public_release="0" current_release="1" output_all_resource_defines="false">
<grit latest_public_release="0" current_release="1">
<outputs>
<output filename="grit/components_scaled_resources.h" type="rc_header" context="default_100_percent">
<emit emit_type='prepend'></emit>

@ -7,7 +7,7 @@ Feature Module (DevUI DFM) for Android Chrome. More info:
* DevUI page resources that are *not* for Android Chrome can be aggregated in
components_resources.grd (or browser_resources.grd if applicable).
-->
<grit latest_public_release="0" current_release="1" output_all_resource_defines="false">
<grit latest_public_release="0" current_release="1">
<outputs>
<output filename="grit/dev_ui_components_resources.h" type="rc_header">
<emit emit_type='prepend'></emit>

@ -7,7 +7,7 @@ Other resources that belong in this file:
* Aliased resources (see shared_resources_data_source.cc).
* (Optional) Resources for non-Android DevUI pages.
-->
<grit latest_public_release="0" current_release="1" output_all_resource_defines="false">
<grit latest_public_release="0" current_release="1">
<outputs>
<output filename="grit/content_resources.h" type="rc_header">
<emit emit_type='prepend'></emit>

@ -643,10 +643,7 @@ follows:
```xml
<?xml version="1.0" encoding="UTF-8"?>
<grit
current_release="1"
latest_public_release="0"
output_all_resource_defines="false">
<grit current_release="1" latest_public_release="0">
<outputs>
<output
filename="values-am/android_foo_strings.xml"

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<grit base_dir="." latest_public_release="0" current_release="1" output_all_resource_defines="false" source_lang_id="en" enc_check="möl">
<grit base_dir="." latest_public_release="0" current_release="1" source_lang_id="en" enc_check="möl">
<!--
This file contains definition of resources that will be translated for each
locale. The strings in this file are specific to iOS.

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<grit base_dir="." latest_public_release="0" current_release="1" output_all_resource_defines="false" source_lang_id="en" enc_check="möl">
<grit base_dir="." latest_public_release="0" current_release="1" source_lang_id="en" enc_check="möl">
<!--
This file contains definition of resources that will be translated for each
locale. The strings in this file are specific to iOS.

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<grit base_dir="." latest_public_release="0" current_release="1" output_all_resource_defines="false" source_lang_id="en" enc_check="möl">
<grit base_dir="." latest_public_release="0" current_release="1" source_lang_id="en" enc_check="möl">
<!--
This file contains definition of resources that will be translated for each
locale. The strings in this file are specific to iOS.

@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<grit latest_public_release="0"
current_release="1"
output_all_resource_defines="false">
<grit latest_public_release="0" current_release="1">
<outputs>
<output filename="allowlist_test_resources.h" type="rc_header">
<emit emit_type='prepend'></emit>

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<grit latest_public_release="0" current_release="1" output_all_resource_defines="false">
<grit latest_public_release="0" current_release="1">
<outputs>
<output filename="grit/app_locale_settings.h" type="rc_header">
<emit emit_type='prepend'></emit>

@ -5,7 +5,7 @@ each locale. Specifically, these are accessibility UI strings that are used by c
need to be translated for each locale. Note that some accessibility strings remain in blink_strings.grd; those strings need to be part of Android webview. -->
<grit base_dir="." latest_public_release="0" current_release="1"
output_all_resource_defines="false" source_lang_id="en" enc_check="möl">
source_lang_id="en" enc_check="möl">
<outputs>
<output filename="grit/auto_image_annotation_strings.h" type="rc_header">
<emit emit_type='prepend'></emit>

@ -5,7 +5,7 @@ each locale. Specifically, these are AX strings that are used by app/ that
need to be translated for each locale.-->
<grit base_dir="." latest_public_release="0" current_release="1"
output_all_resource_defines="false" source_lang_id="en">
source_lang_id="en">
<outputs>
<output filename="grit/ax_strings.h" type="rc_header">
<emit emit_type='prepend'></emit>

@ -5,7 +5,7 @@ each locale. Specifically, these are UI strings that are used by app/ that
need to be translated for each locale.-->
<grit base_dir="." latest_public_release="0" current_release="1"
output_all_resource_defines="false" source_lang_id="en" enc_check="möl">
source_lang_id="en" enc_check="möl">
<outputs>
<!-- TODO add each of your output files. Modify the three below, and add
your own for your various languages. See the user's guide

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<grit base_dir="." latest_public_release="0" current_release="1"
output_all_resource_defines="false" source_lang_id="en" enc_check="möl">
source_lang_id="en" enc_check="möl">
<outputs>
<output filename="grit/webui_examples_resources.h" type="rc_header">
<emit emit_type='prepend'></emit>

@ -46,8 +46,7 @@ import sys
_CWD = os.getcwd()
GRD_BEGIN_TEMPLATE = '<?xml version="1.0" encoding="UTF-8"?>\n'\
'<grit latest_public_release="0" current_release="1" '\
'output_all_resource_defines="false">\n'\
'<grit latest_public_release="0" current_release="1">\n'\
' <outputs>\n'\
' <output filename="{out_dir}/{prefix}_resources.h" '\
'type="rc_header">\n'\

@ -20,7 +20,7 @@ pathToHere = os.path.relpath(_HERE_DIR, _CWD)
# exist. We can't alter the translation script, so work around it by
# hardcoding this string, instead of checking in even more dummy files.
EXPECTED_GRD_WITH_GRDP_FILES = '''<?xml version="1.0" encoding="UTF-8"?>
<grit latest_public_release="0" current_release="1" output_all_resource_defines="false">
<grit latest_public_release="0" current_release="1">
<outputs>
<output filename="grit/test_resources.h" type="rc_header">
<emit emit_type='prepend'></emit>

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<grit latest_public_release="0" current_release="1" output_all_resource_defines="false">
<grit latest_public_release="0" current_release="1">
<outputs>
<output filename="grit/test_resources.h" type="rc_header">
<emit emit_type='prepend'></emit>

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<grit latest_public_release="0" current_release="1" output_all_resource_defines="false">
<grit latest_public_release="0" current_release="1">
<outputs>
<output filename="grit/test_resources.h" type="rc_header">
<emit emit_type='prepend'></emit>

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<grit latest_public_release="0" current_release="1" output_all_resource_defines="false">
<grit latest_public_release="0" current_release="1">
<outputs>
<output filename="grit/test_resources.h" type="rc_header">
<emit emit_type='prepend'></emit>

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<grit latest_public_release="0" current_release="1" output_all_resource_defines="false">
<grit latest_public_release="0" current_release="1">
<outputs>
<output filename="foo/bar/test_resources.h" type="rc_header">
<emit emit_type='prepend'></emit>

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<grit latest_public_release="0" current_release="1" output_all_resource_defines="false">
<grit latest_public_release="0" current_release="1">
<outputs>
<output filename="grit/test_resources.h" type="rc_header">
<emit emit_type='prepend'></emit>