0

Simplify android grit templates to make use of resources.zip

Now that grit can directly output a resources.zip, we no longer need to
enumerate the individual outputs in GN.

Bug: None
Change-Id: I922b2f30d578c242fc149710b9a7e197ac066894
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6512614
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Owners-Override: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Sam Maier <smaier@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1457110}
This commit is contained in:
Andrew Grieve
2025-05-07 10:42:09 -07:00
committed by Chromium LUCI CQ
parent 4bec5b57d1
commit 77c3f15294
27 changed files with 398 additions and 271 deletions
android_webview
BUILD.gn
tools
system_webview_shell
chrome
android
expectations
features
keyboard_accessory
internal
tab_ui
webapk
shell_apk
app
browser
password_check
android
internal
readaloud
android
resources
recent_tabs
internal
tab_ui
android
touch_to_fill
password_manager
android
internal
ui
android
strings
chromecast/android
components
autofill
android
browser_ui
strings
android
cronet
embedder_support
android
javascript_dialogs
android
permissions
android
plus_addresses
resources
strings
strings
webapps
browser
android
content/public/android
docs
tools/grit
ui/android

@ -1109,10 +1109,6 @@ if (_is_default_toolchain) {
java_strings_grd("strings_grd") {
grd_file = "java/strings/android_webview_strings.grd"
outputs = [ "values/android_webview_strings.xml" ] +
process_file_template(
android_bundle_locales_as_resources,
[ "values-{{source_name_part}}/android_webview_strings.xml" ])
}
}

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<issues format="6" by="lint 8.11.0-alpha07" type="baseline" client="" dependencies="true" name="" variant="all" version="8.11.0-alpha07">
<issues format="6" by="lint 8.11.0-alpha09" type="baseline" client="" dependencies="true" name="" variant="all" version="8.11.0-alpha09">
<issue
id="NewApi"

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<issues format="6" by="lint 8.11.0-alpha07" type="baseline" client="" dependencies="true" name="" variant="all" version="8.11.0-alpha07">
<issues format="6" by="lint 8.11.0-alpha09" type="baseline" client="" dependencies="true" name="" variant="all" version="8.11.0-alpha09">
<issue
id="WrongCommentType"
@ -63,7 +63,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="../../chrome/browser/back_press/android/java/src/org/chromium/chrome/browser/back_press/BackPressManager.java"
line="278"
line="334"
column="8"/>
</issue>
@ -74,7 +74,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="../../base/android/java/src/org/chromium/base/process_launcher/ChildProcessService.java"
line="387"
line="393"
column="8"/>
</issue>
@ -118,7 +118,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="../../chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java"
line="348"
line="338"
column="8"/>
</issue>
@ -228,7 +228,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="../../chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java"
line="1327"
line="1344"
column="43"/>
</issue>
@ -1130,7 +1130,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="../../chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java"
line="291"
line="300"
column="53"/>
</issue>
@ -1145,17 +1145,6 @@
column="52"/>
</issue>
<issue
id="WrongConstant"
message="Must be one of: DialogDismissalCause.UNKNOWN, DialogDismissalCause.POSITIVE_BUTTON_CLICKED, DialogDismissalCause.NEGATIVE_BUTTON_CLICKED, DialogDismissalCause.ACTION_ON_CONTENT, DialogDismissalCause.DISMISSED_BY_NATIVE, DialogDismissalCause.NAVIGATE_BACK, DialogDismissalCause.TOUCH_OUTSIDE, DialogDismissalCause.NAVIGATE_BACK_OR_TOUCH_OUTSIDE, DialogDismissalCause.TAB_SWITCHED, DialogDismissalCause.TAB_DESTROYED, DialogDismissalCause.ACTIVITY_DESTROYED, DialogDismissalCause.NOT_ATTACHED_TO_WINDOW, DialogDismissalCause.NAVIGATE, DialogDismissalCause.WEB_CONTENTS_DESTROYED, DialogDismissalCause.DIALOG_INTERACTION_DEFERRED, DialogDismissalCause.ACTION_ON_DIALOG_COMPLETED, DialogDismissalCause.ACTION_ON_DIALOG_NOT_POSSIBLE, DialogDismissalCause.CLIENT_TIMEOUT, but could be ButtonType.POSITIVE, ButtonType.NEGATIVE, ButtonType.TITLE_ICON, ButtonType.POSITIVE_EPHEMERAL"
errorLine1=" mManager.dismissDialog(model, buttonType);"
errorLine2=" ~~~~~~~~~~">
<location
file="../../components/browser_ui/contacts_picker/android/java/src/org/chromium/components/browser_ui/contacts_picker/ContactView.java"
line="121"
column="55"/>
</issue>
<issue
id="WrongConstant"
message="Must be one of: SigninAccessPoint.RECENT_TABS, SigninAccessPoint.BOOKMARK_MANAGER, SigninAccessPoint.HISTORY_PAGE, SigninAccessPoint.NTP_FEED_TOP_PROMO, SigninAccessPoint.NTP_FEED_BOTTOM_PROMO, SigninAccessPoint.SAFETY_CHECK, SigninAccessPoint.SETTINGS, SigninAccessPoint.WEB_SIGNIN, SigninAccessPoint.NTP_SIGNED_OUT_ICON, SigninAccessPoint.NTP_FEED_CARD_MENU_PROMO, SigninAccessPoint.SEND_TAB_TO_SELF_PROMO, SigninAccessPoint.CCT_ACCOUNT_MISMATCH_NOTIFICATION, SigninAccessPoint.COLLABORATION_JOIN_TAB_GROUP, SigninAccessPoint.COLLABORATION_SHARE_TAB_GROUP, SigninAccessPoint.COLLABORATION_LEAVE_OR_DELETE_TAB_GROUP, SigninAccessPoint.HISTORY_SYNC_EDUCATIONAL_TIP"
@ -1449,7 +1438,7 @@
errorLine2=" ^">
<location
file="../../chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java"
line="410"
line="417"
column="25"/>
</issue>
@ -1541,6 +1530,314 @@
column="17"/>
</issue>
<issue
id="ImpliedQuantity"
message="The quantity `&apos;one&apos;` matches more than one specific number in this locale (0, 1), but the message did not include a formatting argument (such as `%d`). This is usually an internationalization error. See full issue explanation for more."
errorLine1=" &lt;item quantity=&quot;one&quot;>&quot;কাইলৈ ম্যাদ উকলিব&quot;&lt;/item>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="gen/chrome/android/monochrome_public_bundle__lint/RESZIPS/obj/components/strings/components_strings.resources.zip/values-as/components_strings.xml"
line="357"
column="3"/>
</issue>
<issue
id="ImpliedQuantity"
message="The quantity `&apos;one&apos;` matches more than one specific number in this locale (0, 1), but the message did not include a formatting argument (such as `%d`). This is usually an internationalization error. See full issue explanation for more."
errorLine1=" &lt;item quantity=&quot;one&quot;>&quot;আগামীকাল মেয়াদ শেষ হবে&quot;&lt;/item>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="gen/chrome/android/monochrome_public_bundle__lint/RESZIPS/obj/components/strings/components_strings.resources.zip/values-bn/components_strings.xml"
line="357"
column="3"/>
</issue>
<issue
id="ImpliedQuantity"
message="The quantity `&apos;one&apos;` matches more than one specific number in this locale (0, 1), but the message did not include a formatting argument (such as `%d`). This is usually an internationalization error. See full issue explanation for more."
errorLine1=" &lt;item quantity=&quot;one&quot;>&quot;فردا منقضی می‌شود&quot;&lt;/item>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="gen/chrome/android/monochrome_public_bundle__lint/RESZIPS/obj/components/strings/components_strings.resources.zip/values-fa/components_strings.xml"
line="357"
column="3"/>
</issue>
<issue
id="ImpliedQuantity"
message="The quantity `&apos;one&apos;` matches more than one specific number in this locale (0, 1), but the message did not include a formatting argument (such as `%d`). This is usually an internationalization error. See full issue explanation for more."
errorLine1=" &lt;item quantity=&quot;one&quot;>&quot;Expire demain&quot;&lt;/item>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="gen/chrome/android/monochrome_public_bundle__lint/RESZIPS/obj/components/strings/components_strings.resources.zip/values-fr-rCA/components_strings.xml"
line="357"
column="3"/>
</issue>
<issue
id="ImpliedQuantity"
message="The quantity `&apos;one&apos;` matches more than one specific number in this locale (0, 1), but the message did not include a formatting argument (such as `%d`). This is usually an internationalization error. See full issue explanation for more."
errorLine1=" &lt;item quantity=&quot;one&quot;>&quot;Expire demain&quot;&lt;/item>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="gen/chrome/android/monochrome_public_bundle__lint/RESZIPS/obj/components/strings/components_strings.resources.zip/values-fr/components_strings.xml"
line="357"
column="3"/>
</issue>
<issue
id="ImpliedQuantity"
message="The quantity `&apos;one&apos;` matches more than one specific number in this locale (0, 1), but the message did not include a formatting argument (such as `%d`). This is usually an internationalization error. See full issue explanation for more."
errorLine1=" &lt;item quantity=&quot;one&quot;>&quot;આવતીકાલે સમયસીમા સમાપ્ત થાય છે&quot;&lt;/item>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="gen/chrome/android/monochrome_public_bundle__lint/RESZIPS/obj/components/strings/components_strings.resources.zip/values-gu/components_strings.xml"
line="357"
column="3"/>
</issue>
<issue
id="ImpliedQuantity"
message="The quantity `&apos;one&apos;` matches more than one specific number in this locale (0, 1), but the message did not include a formatting argument (such as `%d`). This is usually an internationalization error. See full issue explanation for more."
errorLine1=" &lt;item quantity=&quot;one&quot;>&quot;Գործողության ժամկետը սպառվում է վաղը&quot;&lt;/item>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="gen/chrome/android/monochrome_public_bundle__lint/RESZIPS/obj/components/strings/components_strings.resources.zip/values-hy/components_strings.xml"
line="357"
column="3"/>
</issue>
<issue
id="ImpliedQuantity"
message="The quantity `&apos;one&apos;` matches more than one specific number in this locale (0, 1), but the message did not include a formatting argument (such as `%d`). This is usually an internationalization error. See full issue explanation for more."
errorLine1=" &lt;item quantity=&quot;one&quot;>&quot;ਮਿਆਦ ਕੱਲ੍ਹ ਨੂੰ ਸਮਾਪਤ ਹੋ ਜਾਵੇਗੀ&quot;&lt;/item>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="gen/chrome/android/monochrome_public_bundle__lint/RESZIPS/obj/components/strings/components_strings.resources.zip/values-pa/components_strings.xml"
line="357"
column="3"/>
</issue>
<issue
id="ImpliedQuantity"
message="The quantity `&apos;one&apos;` matches more than one specific number in this locale (0, 1), but the message did not include a formatting argument (such as `%d`). This is usually an internationalization error. See full issue explanation for more."
errorLine1=" &lt;item quantity=&quot;one&quot;>&quot;හෙට කල් ඉකුත් වෙයි&quot;&lt;/item>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="gen/chrome/android/monochrome_public_bundle__lint/RESZIPS/obj/components/strings/components_strings.resources.zip/values-si/components_strings.xml"
line="357"
column="3"/>
</issue>
<issue
id="ImpliedQuantity"
message="The quantity `&apos;one&apos;` matches more than one specific number in this locale (0, 1), but the message did not include a formatting argument (such as `%d`). This is usually an internationalization error. See full issue explanation for more."
errorLine1=" &lt;item quantity=&quot;one&quot;>&quot;Kuphelelwa yisikhathi kusasa&quot;&lt;/item>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="gen/chrome/android/monochrome_public_bundle__lint/RESZIPS/obj/components/strings/components_strings.resources.zip/values-zu/components_strings.xml"
line="357"
column="3"/>
</issue>
<issue
id="ImpliedQuantity"
message="The quantity `&apos;one&apos;` matches more than one specific number in this locale (0~3, 5, 7, 8, 10~13, 15, 17, 18, 20, 21, 100, 1000, 10000, 100000, 1000000, …), but the message did not include a formatting argument (such as `%d`). This is usually an internationalization error. See full issue explanation for more."
errorLine1=" &lt;item quantity=&quot;one&quot;>&quot;Mag-e-expire bukas&quot;&lt;/item>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="gen/chrome/android/monochrome_public_bundle__lint/RESZIPS/obj/components/strings/components_strings.resources.zip/values-tl/components_strings.xml"
line="357"
column="3"/>
</issue>
<issue
id="ImpliedQuantity"
message="The quantity `&apos;one&apos;` matches more than one specific number in this locale (1, 101, 201, 301, 401, 501, 601, 701, 1001, …), but the message did not include a formatting argument (such as `%d`). This is usually an internationalization error. See full issue explanation for more."
errorLine1=" &lt;item quantity=&quot;one&quot;>&quot;Poteče jutri&quot;&lt;/item>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="gen/chrome/android/monochrome_public_bundle__lint/RESZIPS/obj/components/strings/components_strings.resources.zip/values-sl/components_strings.xml"
line="357"
column="3"/>
</issue>
<issue
id="ImpliedQuantity"
message="The quantity `&apos;one&apos;` matches more than one specific number in this locale (1, 21, 31, 41, 51, 61, 71, 81, 101, 1001, …), but the message did not include a formatting argument (such as `%d`). This is usually an internationalization error. See full issue explanation for more."
errorLine1=" &lt;item quantity=&quot;one&quot;>&quot;Тэрмін дзеяння заканчваецца заўтра&quot;&lt;/item>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="gen/chrome/android/monochrome_public_bundle__lint/RESZIPS/obj/components/strings/components_strings.resources.zip/values-be/components_strings.xml"
line="357"
column="3"/>
</issue>
<issue
id="ImpliedQuantity"
message="The quantity `&apos;one&apos;` matches more than one specific number in this locale (1, 21, 31, 41, 51, 61, 71, 81, 101, 1001, …), but the message did not include a formatting argument (such as `%d`). This is usually an internationalization error. See full issue explanation for more."
errorLine1=" &lt;item quantity=&quot;one&quot;>&quot;Ističe sutra&quot;&lt;/item>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="gen/chrome/android/monochrome_public_bundle__lint/RESZIPS/obj/components/strings/components_strings.resources.zip/values-bs/components_strings.xml"
line="357"
column="3"/>
</issue>
<issue
id="ImpliedQuantity"
message="The quantity `&apos;one&apos;` matches more than one specific number in this locale (1, 21, 31, 41, 51, 61, 71, 81, 101, 1001, …), but the message did not include a formatting argument (such as `%d`). This is usually an internationalization error. See full issue explanation for more."
errorLine1=" &lt;item quantity=&quot;one&quot;>&quot;Rennur út á morgun&quot;&lt;/item>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="gen/chrome/android/monochrome_public_bundle__lint/RESZIPS/obj/components/strings/components_strings.resources.zip/values-is/components_strings.xml"
line="357"
column="3"/>
</issue>
<issue
id="ImpliedQuantity"
message="The quantity `&apos;one&apos;` matches more than one specific number in this locale (1, 21, 31, 41, 51, 61, 71, 81, 101, 1001, …), but the message did not include a formatting argument (such as `%d`). This is usually an internationalization error. See full issue explanation for more."
errorLine1=" &lt;item quantity=&quot;one&quot;>&quot;Истекува утре&quot;&lt;/item>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="gen/chrome/android/monochrome_public_bundle__lint/RESZIPS/obj/components/strings/components_strings.resources.zip/values-mk/components_strings.xml"
line="357"
column="3"/>
</issue>
<issue
id="ImpliedQuantity"
message="The quantity `&apos;one&apos;` matches more than one specific number in this locale (1, 21, 31, 41, 51, 61, 71, 81, 101, 1001, …), but the message did not include a formatting argument (such as `%d`). This is usually an internationalization error. See full issue explanation for more."
errorLine1=" &lt;item quantity=&quot;one&quot;>&quot;Срок действия истекает завтра&quot;&lt;/item>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="gen/chrome/android/monochrome_public_bundle__lint/RESZIPS/obj/components/strings/components_strings.resources.zip/values-ru/components_strings.xml"
line="357"
column="3"/>
</issue>
<issue
id="ImpliedQuantity"
message="The quantity `&apos;one&apos;` matches more than one specific number in this locale (0, 1), but the message did not include a formatting argument (such as `%d`). This is usually an internationalization error. See full issue explanation for more."
errorLine1=" &lt;item quantity=&quot;one&quot;>&quot;ነገ ጊዜው ያበቃል&quot;&lt;/item>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="gen/chrome/android/monochrome_public_bundle__lint/RESZIPS/obj/components/strings/components_strings.resources.zip/values-am/components_strings.xml"
line="358"
column="3"/>
</issue>
<issue
id="ImpliedQuantity"
message="The quantity `&apos;one&apos;` matches more than one specific number in this locale (0, 1), but the message did not include a formatting argument (such as `%d`). This is usually an internationalization error. See full issue explanation for more."
errorLine1=" &lt;item quantity=&quot;one&quot;>&quot;समयसीमा कल खत्म हो जाएगी&quot;&lt;/item>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="gen/chrome/android/monochrome_public_bundle__lint/RESZIPS/obj/components/strings/components_strings.resources.zip/values-hi/components_strings.xml"
line="358"
column="3"/>
</issue>
<issue
id="ImpliedQuantity"
message="The quantity `&apos;one&apos;` matches more than one specific number in this locale (0, 1), but the message did not include a formatting argument (such as `%d`). This is usually an internationalization error. See full issue explanation for more."
errorLine1=" &lt;item quantity=&quot;one&quot;>&quot;ನಾಳೆ ಅವಧಿ ಮುಕ್ತಾಯವಾಗುತ್ತದೆ&quot;&lt;/item>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="gen/chrome/android/monochrome_public_bundle__lint/RESZIPS/obj/components/strings/components_strings.resources.zip/values-kn/components_strings.xml"
line="358"
column="3"/>
</issue>
<issue
id="ImpliedQuantity"
message="The quantity `&apos;one&apos;` matches more than one specific number in this locale (0, 1), but the message did not include a formatting argument (such as `%d`). This is usually an internationalization error. See full issue explanation for more."
errorLine1=" &lt;item quantity=&quot;one&quot;>&quot;Expira amanhã&quot;&lt;/item>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="gen/chrome/android/monochrome_public_bundle__lint/RESZIPS/obj/components/strings/components_strings.resources.zip/values-pt-rBR/components_strings.xml"
line="358"
column="3"/>
</issue>
<issue
id="ImpliedQuantity"
message="The quantity `&apos;one&apos;` matches more than one specific number in this locale (0, 1), but the message did not include a formatting argument (such as `%d`). This is usually an internationalization error. See full issue explanation for more."
errorLine1=" &lt;item quantity=&quot;one&quot;>&quot;Expira amanhã&quot;&lt;/item>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="gen/chrome/android/monochrome_public_bundle__lint/RESZIPS/obj/components/strings/components_strings.resources.zip/values-pt-rPT/components_strings.xml"
line="358"
column="3"/>
</issue>
<issue
id="ImpliedQuantity"
message="The quantity `&apos;one&apos;` matches more than one specific number in this locale (1, 21, 31, 41, 51, 61, 71, 81, 101, 1001, …), but the message did not include a formatting argument (such as `%d`). This is usually an internationalization error. See full issue explanation for more."
errorLine1=" &lt;item quantity=&quot;one&quot;>&quot;Ističe sutra&quot;&lt;/item>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="gen/chrome/android/monochrome_public_bundle__lint/RESZIPS/obj/components/strings/components_strings.resources.zip/values-b+sr+Latn/components_strings.xml"
line="358"
column="3"/>
</issue>
<issue
id="ImpliedQuantity"
message="The quantity `&apos;one&apos;` matches more than one specific number in this locale (1, 21, 31, 41, 51, 61, 71, 81, 101, 1001, …), but the message did not include a formatting argument (such as `%d`). This is usually an internationalization error. See full issue explanation for more."
errorLine1=" &lt;item quantity=&quot;one&quot;>&quot;Istječe sutra&quot;&lt;/item>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="gen/chrome/android/monochrome_public_bundle__lint/RESZIPS/obj/components/strings/components_strings.resources.zip/values-hr/components_strings.xml"
line="358"
column="3"/>
</issue>
<issue
id="ImpliedQuantity"
message="The quantity `&apos;one&apos;` matches more than one specific number in this locale (1, 21, 31, 41, 51, 61, 71, 81, 101, 1001, …), but the message did not include a formatting argument (such as `%d`). This is usually an internationalization error. See full issue explanation for more."
errorLine1=" &lt;item quantity=&quot;one&quot;>&quot;Galiojimo laikas baigsis rytoj&quot;&lt;/item>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="gen/chrome/android/monochrome_public_bundle__lint/RESZIPS/obj/components/strings/components_strings.resources.zip/values-lt/components_strings.xml"
line="358"
column="3"/>
</issue>
<issue
id="ImpliedQuantity"
message="The quantity `&apos;one&apos;` matches more than one specific number in this locale (1, 21, 31, 41, 51, 61, 71, 81, 101, 1001, …), but the message did not include a formatting argument (such as `%d`). This is usually an internationalization error. See full issue explanation for more."
errorLine1=" &lt;item quantity=&quot;one&quot;>&quot;Derīguma termiņš beigsies rīt&quot;&lt;/item>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="gen/chrome/android/monochrome_public_bundle__lint/RESZIPS/obj/components/strings/components_strings.resources.zip/values-lv/components_strings.xml"
line="358"
column="3"/>
</issue>
<issue
id="ImpliedQuantity"
message="The quantity `&apos;one&apos;` matches more than one specific number in this locale (1, 21, 31, 41, 51, 61, 71, 81, 101, 1001, …), but the message did not include a formatting argument (such as `%d`). This is usually an internationalization error. See full issue explanation for more."
errorLine1=" &lt;item quantity=&quot;one&quot;>&quot;Истиче сутра&quot;&lt;/item>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="gen/chrome/android/monochrome_public_bundle__lint/RESZIPS/obj/components/strings/components_strings.resources.zip/values-sr/components_strings.xml"
line="358"
column="3"/>
</issue>
<issue
id="ImpliedQuantity"
message="The quantity `&apos;one&apos;` matches more than one specific number in this locale (1, 21, 31, 41, 51, 61, 71, 81, 101, 1001, …), but the message did not include a formatting argument (such as `%d`). This is usually an internationalization error. See full issue explanation for more."
errorLine1=" &lt;item quantity=&quot;one&quot;>&quot;Строк дії закінчується завтра&quot;&lt;/item>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="gen/chrome/android/monochrome_public_bundle__lint/RESZIPS/obj/components/strings/components_strings.resources.zip/values-uk/components_strings.xml"
line="358"
column="3"/>
</issue>
<issue
id="DataExtractionRules"
message="The attribute `android:allowBackup` is deprecated from Android 12 and higher and may be removed in future versions. Consider adding the attribute `android:dataExtractionRules` specifying an `@xml` resource which configures cloud backups and device transfers on Android 12 and higher."
@ -1889,7 +2186,7 @@
errorLine2=" ~~~~~~~~~~~~">
<location
file="../../chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java"
line="688"
line="689"
column="20"/>
</issue>
@ -1988,7 +2285,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="../../chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/menu_button/MenuButton.java"
line="79"
line="85"
column="9"/>
</issue>
@ -2065,7 +2362,7 @@
errorLine2=" ~~~~~~~~~~~~">
<location
file="../../chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java"
line="764"
line="787"
column="20"/>
</issue>
@ -2076,7 +2373,7 @@
errorLine2=" ~~~~~~~~~~~~">
<location
file="../../chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java"
line="532"
line="542"
column="20"/>
</issue>
@ -2120,7 +2417,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="../../chrome/android/java/src/org/chromium/chrome/browser/customtabs/features/partialcustomtab/PartialCustomTabSideSheetStrategy.java"
line="245"
line="261"
column="13"/>
</issue>

@ -3,7 +3,6 @@
# found in the LICENSE file.
import("//build/config/android/rules.gni")
import("//build/config/locales.gni")
import("//chrome/common/features.gni")
import("//third_party/jni_zero/jni_zero.gni")
import("//tools/grit/grit_rule.gni")
@ -168,7 +167,4 @@ android_resources("java_resources") {
java_strings_grd("java_strings_grd") {
defines = chrome_grit_defines
grd_file = "java/strings/android_keyboard_accessory_strings.grd"
outputs = [ "values/android_keyboard_accessory_strings.xml" ] + process_file_template(
android_bundle_locales_as_resources,
[ "values-{{source_name_part}}/android_keyboard_accessory_strings.xml" ])
}

@ -3,7 +3,6 @@
# found in the LICENSE file.
import("//build/config/android/rules.gni")
import("//build/config/locales.gni")
import("//chrome/android/features/android_library_factory_tmpl.gni")
import("//chrome/common/features.gni")
import("//tools/grit/grit_rule.gni")
@ -11,11 +10,6 @@ import("//tools/grit/grit_rule.gni")
java_strings_grd("java_strings_grd") {
defines = chrome_grit_defines
grd_file = "java/strings/android_chrome_tab_ui_strings.grd"
outputs =
[ "values/android_chrome_tab_ui_strings.xml" ] +
process_file_template(
android_bundle_locales_as_resources,
[ "values-{{source_name_part}}/android_chrome_tab_ui_strings.xml" ])
}
android_resources("java_resources") {

@ -3,7 +3,6 @@
# found in the LICENSE file.
import("//build/config/android/rules.gni")
import("//build/config/locales.gni")
import("//tools/grit/grit_rule.gni")
import("current_version/current_version.gni")
import("generate_manifest_for_upload_outputs.gni")
@ -284,11 +283,6 @@ template("webapk_tmpl") {
java_strings_grd("webapk_strings_grd") {
grd_file = "//chrome/android/webapk/strings/android_webapk_strings.grd"
outputs = [ "values/android_webapk_strings.xml" ] +
process_file_template(
android_bundle_locales_as_resources,
[ "values-{{source_name_part}}/android_webapk_strings.xml" ])
}
# Template for WebAPK. When a WebAPK is generated:

@ -82,20 +82,6 @@ if (is_win) {
}
}
if (is_android) {
android_generated_java_resources =
[ "java/res/values/generated_resources.xml" ] +
process_file_template(
android_bundle_locales_as_resources,
[ "java/res/values-{{source_name_part}}/generated_resources.xml" ])
strings_java_resources =
[ "java/res/values/branded_strings.xml" ] +
process_file_template(
android_bundle_locales_as_resources,
[ "java/res/values-{{source_name_part}}/branded_strings.xml" ])
}
grit("generated_resources") {
source = "generated_resources.grd"
defines = chrome_grit_defines + [ "is_cfm=${is_cfm}" ]
@ -105,19 +91,21 @@ grit("generated_resources") {
process_file_template(all_chrome_locales,
[ "generated_resources_{{source_name_part}}.pak" ])
if (is_android) {
outputs += android_generated_java_resources
create_android_resources = true
}
}
if (is_android) {
java_strings_grd_prebuilt("java_strings_grd") {
grit_output_dir = "$root_gen_dir/chrome/java/res"
generated_files =
rebase_path(android_generated_java_resources, "java/res", ".") +
rebase_path(strings_java_resources, "java/res", ".")
deps = [
":branded_strings",
":generated_resources",
java_strings_grd_prebuilt("branded_resources_grd") {
generating_target = ":branded_strings"
}
java_strings_grd_prebuilt("generated_resources_grd") {
generating_target = ":generated_resources"
}
java_group("java_strings_grd") {
public_deps = [
":branded_resources_grd",
":generated_resources_grd",
]
}
}
@ -132,7 +120,7 @@ grit("branded_strings") {
[ "branded_strings_{{source_name_part}}.pak" ])
if (is_android) {
outputs += strings_java_resources
create_android_resources = true
}
}

@ -3,7 +3,6 @@
# found in the LICENSE file.
import("//build/config/android/rules.gni")
import("//build/config/locales.gni")
import("//chrome/android/features/android_library_factory_tmpl.gni")
import("//chrome/common/features.gni")
import("//third_party/jni_zero/jni_zero.gni")
@ -155,9 +154,4 @@ android_resources("java_resources") {
java_strings_grd("java_strings_grd") {
defines = chrome_grit_defines
grd_file = "java/strings/android_password_check_strings.grd"
outputs =
[ "values/android_password_check_strings.xml" ] +
process_file_template(
android_bundle_locales_as_resources,
[ "values-{{source_name_part}}/android_password_check_strings.xml" ])
}

@ -2,15 +2,10 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/locales.gni")
import("//chrome/common/features.gni")
import("//tools/grit/grit_rule.gni")
java_strings_grd("ui_strings_grd") {
defines = chrome_grit_defines
grd_file = "android_readaloud_strings.grd"
outputs = [ "values/android_readaloud_strings.xml" ] +
process_file_template(
android_bundle_locales_as_resources,
[ "values-{{source_name_part}}/android_readaloud_strings.xml" ])
}

@ -3,7 +3,6 @@
# found in the LICENSE file.
import("//build/config/android/rules.gni")
import("//build/config/locales.gni")
import("//chrome/common/features.gni")
import("//tools/grit/grit_rule.gni")
@ -102,11 +101,6 @@ android_resources("java_resources") {
java_strings_grd("java_strings_grd") {
defines = chrome_grit_defines
grd_file = "android/java/strings/android_restore_tabs_strings.grd"
outputs =
[ "values/android_restore_tabs_strings.xml" ] +
process_file_template(
android_bundle_locales_as_resources,
[ "values-{{source_name_part}}/android_restore_tabs_strings.xml" ])
}
robolectric_library("junit") {

@ -3,7 +3,6 @@
# found in the LICENSE file.
import("//build/config/android/rules.gni")
import("//build/config/locales.gni")
import("//chrome/android/features/android_library_factory_tmpl.gni")
import("//chrome/common/features.gni")
import("//third_party/jni_zero/jni_zero.gni")
@ -12,10 +11,6 @@ import("//tools/grit/grit_rule.gni")
java_strings_grd("java_strings_grd") {
defines = chrome_grit_defines
grd_file = "java/strings/android_tab_ui_strings.grd"
outputs = [ "values/android_tab_ui_strings.xml" ] +
process_file_template(
android_bundle_locales_as_resources,
[ "values-{{source_name_part}}/android_tab_ui_strings.xml" ])
}
android_library("java") {

@ -3,7 +3,6 @@
# found in the LICENSE file.
import("//build/config/android/rules.gni")
import("//build/config/locales.gni")
import("//chrome/common/features.gni")
import("//third_party/jni_zero/jni_zero.gni")
import("//tools/grit/grit_rule.gni")
@ -89,9 +88,4 @@ android_resources("java_resources") {
java_strings_grd("java_strings_grd") {
defines = chrome_grit_defines
grd_file = "java/strings/android_touch_to_fill_strings.grd"
outputs =
[ "values/android_touch_to_fill_strings.xml" ] +
process_file_template(
android_bundle_locales_as_resources,
[ "values-{{source_name_part}}/android_touch_to_fill_strings.xml" ])
}

@ -2,15 +2,10 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/locales.gni")
import("//chrome/common/features.gni")
import("//tools/grit/grit_rule.gni")
java_strings_grd("ui_strings_grd") {
defines = chrome_grit_defines
grd_file = "android_chrome_strings.grd"
outputs = [ "values/android_chrome_strings.xml" ] +
process_file_template(
android_bundle_locales_as_resources,
[ "values-{{source_name_part}}/android_chrome_strings.xml" ])
}

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<issues format="6" by="lint 8.11.0-alpha07" type="baseline" client="" dependencies="true" name="" variant="all" version="8.11.0-alpha07">
<issues format="6" by="lint 8.11.0-alpha09" type="baseline" client="" dependencies="true" name="" variant="all" version="8.11.0-alpha09">
<issue
id="PictureInPictureIssue"

@ -3,7 +3,6 @@
# found in the LICENSE file.
import("//build/config/android/rules.gni")
import("//build/config/locales.gni")
import("//third_party/jni_zero/jni_zero.gni")
import("//tools/grit/grit_rule.gni")
@ -43,10 +42,6 @@ source_set("unit_tests") {
java_strings_grd("autofill_strings_grd") {
grd_file = "java/strings/autofill_strings.grd"
outputs = [ "values/autofill_strings.xml" ] +
process_file_template(
android_bundle_locales_as_resources,
[ "values-{{source_name_part}}/autofill_strings.xml" ])
}
android_resources("autofill_payments_java_resources") {

@ -2,13 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/locales.gni")
import("//tools/grit/grit_rule.gni")
java_strings_grd("browser_ui_strings_grd") {
grd_file = "browser_ui_strings.grd"
outputs = [ "values/browser_ui_strings.xml" ] +
process_file_template(
android_bundle_locales_as_resources,
[ "values-{{source_name_part}}/browser_ui_strings.xml" ])
}

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<issues format="6" by="lint 8.11.0-alpha07" type="baseline" client="" dependencies="true" name="" variant="all" version="8.11.0-alpha07">
<issues format="6" by="lint 8.11.0-alpha09" type="baseline" client="" dependencies="true" name="" variant="all" version="8.11.0-alpha09">
</issues>

@ -3,7 +3,6 @@
# found in the LICENSE file.
import("//build/config/android/rules.gni")
import("//build/config/locales.gni")
import("//third_party/jni_zero/jni_zero.gni")
import("//tools/grit/grit_rule.gni")
@ -178,9 +177,6 @@ generate_jni("view_jni_headers") {
java_strings_grd("web_contents_delegate_strings_grd") {
grd_file = "java/strings/web_contents_delegate_android_strings.grd"
outputs = [ "values/web_contents_delegate_android_strings.xml" ] + process_file_template(
android_bundle_locales_as_resources,
[ "values-{{source_name_part}}/web_contents_delegate_android_strings.xml" ])
}
static_library("web_contents_delegate") {

@ -3,7 +3,6 @@
# found in the LICENSE file.
import("//build/config/android/rules.gni")
import("//build/config/locales.gni")
import("//third_party/jni_zero/jni_zero.gni")
import("//tools/grit/grit_rule.gni")
@ -49,7 +48,4 @@ generate_jni("jni_headers") {
java_strings_grd("javascript_dialogs_strings_grd") {
grd_file = "javascript_dialogs_android_strings.grd"
outputs = [ "values/javascript_dialogs_android_strings.xml" ] + process_file_template(
android_bundle_locales_as_resources,
[ "values-{{source_name_part}}/javascript_dialogs_android_strings.xml" ])
}

@ -3,7 +3,6 @@
# found in the LICENSE file.
import("//build/config/android/rules.gni")
import("//build/config/locales.gni")
import("//third_party/jni_zero/jni_zero.gni")
import("//tools/grit/grit_rule.gni")
@ -120,11 +119,6 @@ android_resources("java_resources") {
java_strings_grd("permissions_strings_grd") {
grd_file = "permissions_android_strings.grd"
outputs =
[ "values/permissions_android_strings.xml" ] +
process_file_template(
android_bundle_locales_as_resources,
[ "values-{{source_name_part}}/permissions_android_strings.xml" ])
}
android_library("content_settings_enums_java") {

@ -8,11 +8,6 @@ import("//tools/grit/grit_rule.gni")
if (is_android) {
import("//build/config/android/rules.gni")
android_strings_java_resources =
[ "java/res/values/plus_addresses_strings.xml" ] +
process_file_template(
android_bundle_locales_as_resources,
[ "java/res/values-{{source_name_part}}/plus_addresses_strings.xml" ])
}
grit("strings") {
@ -27,16 +22,12 @@ grit("strings") {
all_chrome_locales,
[ "plus_addresses_strings_{{source_name_part}}.pak" ])
if (is_android) {
outputs += android_strings_java_resources
create_android_resources = true
}
}
if (is_android) {
java_strings_grd_prebuilt("strings_grd") {
grit_output_dir =
"$root_gen_dir/components/plus_addresses/resources/strings/java/res"
generated_files =
rebase_path(android_strings_java_resources, "java/res", ".")
deps = [ ":strings" ]
generating_target = ":strings"
}
}

@ -13,11 +13,6 @@ import("//tools/grit/grit_rule.gni")
if (is_android) {
import("//build/config/android/rules.gni")
android_components_strings_java_resources =
[ "java/res/values/components_strings.xml" ] +
process_file_template(
android_bundle_locales_as_resources,
[ "java/res/values-{{source_name_part}}/components_strings.xml" ])
}
group("strings") {
@ -50,16 +45,13 @@ grit("components_strings") {
}
if (is_android) {
outputs += android_components_strings_java_resources
create_android_resources = true
}
}
if (is_android) {
java_strings_grd_prebuilt("components_strings_grd") {
grit_output_dir = "$root_gen_dir/components/strings/java/res"
generated_files =
rebase_path(android_components_strings_java_resources, "java/res", ".")
deps = [ ":components_strings" ]
generating_target = ":components_strings"
}
}
@ -71,14 +63,6 @@ grit("components_branded_strings") {
}
}
if (is_android) {
android_components_locale_settings_java_resources =
[ "java/res/values/components_locale_settings.xml" ]
android_components_locale_settings_java_resources += process_file_template(
android_bundle_locales_as_resources,
[ "java/res/values-{{source_name_part}}/components_locale_settings.xml" ])
}
grit("components_locale_settings") {
source = "../components_locale_settings.grd"
outputs = [ "grit/components_locale_settings.h" ]
@ -87,7 +71,7 @@ grit("components_locale_settings") {
}
if (is_android) {
outputs += android_components_locale_settings_java_resources
create_android_resources = true
}
}
@ -101,23 +85,10 @@ grit("search_engine_descriptions_strings") {
if (is_android) {
java_strings_grd_prebuilt("components_locale_settings_grd") {
grit_output_dir = "$root_gen_dir/components/strings/java/res"
generated_files =
rebase_path(android_components_locale_settings_java_resources,
"java/res",
".")
deps = [ ":components_locale_settings" ]
generating_target = ":components_locale_settings"
}
}
if (is_android) {
android_privacy_sandbox_strings_java_resources =
[ "java/res/values/privacy_sandbox_strings.xml" ]
android_privacy_sandbox_strings_java_resources += process_file_template(
android_bundle_locales_as_resources,
[ "java/res/values-{{source_name_part}}/privacy_sandbox_strings.xml" ])
}
grit("privacy_sandbox_strings") {
source = "../privacy_sandbox_strings.grd"
outputs = [ "grit/privacy_sandbox_strings.h" ]
@ -126,17 +97,12 @@ grit("privacy_sandbox_strings") {
}
if (is_android) {
outputs += android_privacy_sandbox_strings_java_resources
create_android_resources = true
}
}
if (is_android) {
java_strings_grd_prebuilt("privacy_sandbox_strings_grd") {
grit_output_dir = "$root_gen_dir/components/strings/java/res"
generated_files =
rebase_path(android_privacy_sandbox_strings_java_resources,
"java/res",
".")
deps = [ ":privacy_sandbox_strings" ]
generating_target = ":privacy_sandbox_strings"
}
}

@ -4,7 +4,6 @@
import("//build/config/android/config.gni")
import("//build/config/android/rules.gni")
import("//build/config/locales.gni")
import("//third_party/jni_zero/jni_zero.gni")
import("//tools/grit/grit_rule.gni")
@ -151,10 +150,6 @@ android_resources("java_resources") {
java_strings_grd("webapps_strings_grd") {
grd_file = "android_webapps_strings.grd"
outputs = [ "values/android_webapps_strings.xml" ] +
process_file_template(
android_bundle_locales_as_resources,
[ "values-{{source_name_part}}/android_webapps_strings.xml" ])
}
source_set("unit_tests") {

@ -4,7 +4,6 @@
import("//build/config/android/config.gni")
import("//build/config/android/rules.gni")
import("//build/config/locales.gni")
import("//device/vr/buildflags/buildflags.gni")
import("//third_party/jni_zero/jni_zero.gni")
import("//tools/grit/grit_rule.gni")
@ -452,10 +451,6 @@ android_library("content_util_java") {
java_strings_grd("content_strings_grd") {
grd_file = "java/strings/android_content_strings.grd"
outputs = [ "values/android_content_strings.xml" ] +
process_file_template(
android_bundle_locales_as_resources,
[ "values-{{source_name_part}}/android_content_strings.xml" ])
}
java_cpp_enum("content_public_android_java_enums_srcjar") {

@ -677,11 +677,6 @@ Then, create a new GRD target and add it as a dependency on `java_resources` in
java_strings_grd("java_strings_grd") {
defines = chrome_grit_defines
grd_file = "android/resources/strings/android_foo_strings.grd"
outputs = [
"values-am/android_foo_strings.xml",
# Here, too, list output files for other supported languages.
...
]
}
...
android_resources("java_resources") {

@ -120,8 +120,23 @@ template("grit") {
_output_dir = target_gen_dir
}
_grit_outputs =
get_path_info(rebase_path(invoker.outputs, ".", _output_dir), "abspath")
if (defined(invoker.outputs)) {
_grit_outputs =
get_path_info(rebase_path(invoker.outputs, ".", _output_dir), "abspath")
} else {
_grit_outputs = []
}
_create_android_resources = defined(invoker.create_android_resources) &&
invoker.create_android_resources
if (_create_android_resources) {
if (defined(invoker.resources_zip)) {
_resources_zip = invoker.resources_zip
} else {
_resources_zip = "$target_out_dir/$target_name.resources.zip"
}
_grit_outputs += [ _resources_zip ]
}
# Add .info output for all pak files
_pak_info_outputs = []
@ -195,6 +210,13 @@ template("grit") {
"--depend-on-stamp",
] + _grit_flags
if (_create_android_resources) {
args += [
"--android-output-zip",
rebase_path(_resources_zip, root_build_dir),
]
}
# Add brotli executable if using brotli.
if (defined(invoker.use_brotli) && invoker.use_brotli) {
_brotli_target = "//third_party/brotli:brotli($host_toolchain)"
@ -241,7 +263,7 @@ template("grit") {
_asserted_list_file =
"$target_out_dir/${_grit_output_name}_expected_outputs.txt"
write_file(_asserted_list_file,
rebase_path(invoker.outputs, root_build_dir, _output_dir))
rebase_path(_grit_outputs, root_build_dir, _output_dir))
inputs += [ _asserted_list_file ]
args += [
"--assert-file-list",
@ -307,14 +329,12 @@ template("grit") {
# Since we generate a file, we need to be run before the targets that
# depend on us.
sources = []
foreach(_output, _grit_outputs) {
_extension = get_path_info(_output, "extension")
if (_extension != "json" && _extension != "gz" && _extension != "pak" &&
_extension != "xml") {
sources += [ _output ]
}
}
sources = filter_include(_grit_outputs,
[
"*.h",
"*.cc",
"*.rc",
])
# Deps set on the template invocation will go on the action that runs
# grit above rather than this library. This target needs to depend on the
@ -356,93 +376,55 @@ if (is_android) {
# grd_file = "foo_strings.grd"
# }
template("java_strings_grd") {
forward_variables_from(invoker, [ "testonly" ])
_resources_zip = "$target_out_dir/$target_name.resources.zip"
_grit_target_name = "${target_name}__grit"
_grit_output_dir = "$target_gen_dir/${target_name}_grit_output"
_resources_zip = "$target_out_dir/$target_name.resources.zip"
grit(_grit_target_name) {
forward_variables_from(invoker,
[
"deps",
"defines",
])
TESTONLY_AND_VISIBILITY + [
"deps",
"defines",
])
# TODO(agrieve): Remove outputs from callers.
not_needed(invoker, [ "outputs" ])
create_android_resources = true
resources_zip = _resources_zip
grit_flags = [
"-E",
"ANDROID_JAVA_TAGGED_ONLY=false",
]
output_dir = _grit_output_dir
# Ignore pak file IDs since they are not relevant.
resource_ids = ""
source = invoker.grd_file
outputs = invoker.outputs
}
_zip_target_name = "${target_name}__zip"
zip(_zip_target_name) {
base_dir = _grit_output_dir
# No need to depend on the source_set().
_grit_dep = ":${_grit_target_name}_grit"
deps = [ _grit_dep ]
inputs = filter_exclude(get_target_outputs(_grit_dep), [ "*.stamp" ])
output = _resources_zip
}
android_generated_resources(target_name) {
forward_variables_from(invoker,
[
"resource_overlay",
"visibility",
])
generating_target = ":$_zip_target_name"
TESTONLY_AND_VISIBILITY + [ "resource_overlay" ])
generated_resources_zip = _resources_zip
generating_target = ":$_grit_target_name"
}
}
# Declare a target that packages strings.xml generated from a grd file.
# An android_generated_resources() for an existing grit() target.
#
# If this target is included in the deps of an android resources/library/apk,
# the strings.xml will be included with that target.
#
# Variables
# grit_output_dir: directory containing grit-generated files.
# generated_files: list of android resource files to package.
# The grit target must have set create_android_resources = true
#
# Example
# java_strings_grd_prebuilt("foo_strings_grd") {
# grit_output_dir = "$root_gen_dir/foo/grit"
# generated_files = [
# "values/strings.xml"
# ]
# generating_target = ":my_grit_rule"
# }
template("java_strings_grd_prebuilt") {
forward_variables_from(invoker, [ "testonly" ])
_resources_zip = "$target_out_dir/$target_name.resources.zip"
_zip_target_name = "${target_name}__zip"
zip(_zip_target_name) {
base_dir = invoker.grit_output_dir
inputs = rebase_path(invoker.generated_files, ".", base_dir)
output = _resources_zip
if (defined(invoker.deps)) {
deps = []
foreach(_dep, invoker.deps) {
deps += [ "${_dep}_grit" ]
}
}
}
android_generated_resources(target_name) {
forward_variables_from(invoker,
[
"resource_overlay",
"visibility",
])
generating_target = ":$_zip_target_name"
generated_resources_zip = _resources_zip
TESTONLY_AND_VISIBILITY + [
"generating_target",
"resource_overlay",
])
generated_resources_zip =
get_label_info(invoker.generating_target, "target_out_dir") + "/" +
get_label_info(invoker.generating_target, "name") + ".resources.zip"
}
}
}

@ -4,7 +4,6 @@
import("//build/buildflag_header.gni")
import("//build/config/android/rules.gni")
import("//build/config/locales.gni")
import("//build/rust/rust_static_library.gni")
import("//testing/test.gni")
import("//third_party/jni_zero/jni_zero.gni")
@ -190,10 +189,6 @@ java_cpp_enum("java_enums_srcjar") {
java_strings_grd("ui_strings_grd") {
grd_file = "java/strings/android_ui_strings.grd"
outputs = [ "values/android_ui_strings.xml" ] +
process_file_template(
android_bundle_locales_as_resources,
[ "values-{{source_name_part}}/android_ui_strings.xml" ])
}
android_resources("ui_java_resources") {