This CL changes the grit_whitelist parameter to be a string instead of a
part of grit_defines.
This allow user to override the parameter with another file.
The goal of this is to allow creating bundles with their own whitelists.
At the moment, if you want to create a small executable (i.e. an ios extension)
that only uses 3 strings, you are required to include all the strings
whitelisted by the main chrome bundle.
By allowing to override the whitelist argument (instead of only appending the
argument array, it will allow to specify a specific whitelist for a specific
target.
BUG=456837
Review URL: https://codereview.chromium.org/862043002
Cr-Original-Commit-Position: refs/heads/master@{#315324}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 2310fc2b85b31504de87ba22d9d14fc406ed3147
For the file I'm testing with (c/b/resources/about_stats.html),
a rebuild runs 101 edges and compiles a bunch of cc files and takes 40s.
This reduces build times from 40s to 9.6s and reduces the number
of edges to 37.
BUG=439182
R=brettw@chromium.org
Review URL: https://codereview.chromium.org/740463005
Cr-Original-Commit-Position: refs/heads/master@{#306945}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 9261dde33f1939f432cafe6f9654efedba4dc252
Reason for revert:
This is causing instrumentation-yakju-clankium-tot and clang-clankium-tot-builder (downstream) to fail with the following error message:
FAILED: cd ../../clank/native/framework; python ../../../build/android/gyp/process_resources.py --android-sdk /b/build/slave/instrumentation-yakju-clankium-tot/build/src/third_party/android_tools/sdk//platforms/android-19 --android-sdk-tools /b/build/slave/instrumentation-yakju-clankium-tot/build/src/third_party/android_tools/sdk//build-tools/19.0.0 --android-manifest ../../../clank/java/apps/deviceextras/AndroidManifest.xml --dependencies-res-dirs "" --extra-res-packages "" --extra-r-text-files "" --proguard-file ../../../out/Debug/device_extras_apk/proguard.txt --resource-dir ../../../clank/java/apps/deviceextras/res --res-v14-compatibility-dir ../../../out/Debug/device_extras_apk/res_v14_compatibility --crunch-output-dir ../../../out/Debug/device_extras_apk/res --R-dir ../../../out/Debug/device_extras_apk/gen --stamp ../../../out/Debug/device_extras_apk/codegen.stamp
Traceback (most recent call last):
File "../../../build/android/gyp/process_resources.py", line 217, in <module>
main()
File "../../../build/android/gyp/process_resources.py", line 166, in main
options.v14_verify_only)
File "/b/build/slave/instrumentation-yakju-clankium-tot/build/src/build/android/gyp/generate_v14_compatible_resources.py", line 335, in GenerateV14Resources
ErrorIfStyleResourceExistsInDir(input_dir)
File "/b/build/slave/instrumentation-yakju-clankium-tot/build/src/build/android/gyp/generate_v14_compatible_resources.py", line 107, in ErrorIfStyleResourceExistsInDir
'-v17 directory. Please refer to '
Exception: error: style file /b/build/slave/instrumentation-yakju-clankium-tot/build/src/clank/java/apps/deviceextras/res/values/styles.xml should be under /b/build/slave/instrumentation-yakju-clankium-tot/build/src/clank/java/apps/deviceextras/res/values-v17 directory. Please refer to http://crbug.com/243952 for the details.
I don't know resource loading well enough to tell if that's a legitimate issue or not; so for now reverting this to fix the build bots, and if it is a legitimate issue then ideally it could be fixed before relanding this?
Original issue's description:
> Add creation of v14 compatible resources to process_resources.py
>
> There are a lot of steps in processing resources and preparing them for
> packaging. It will be easier if these are all done by the same script.
>
> BUG=375431,359249
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=275401TBR=newt@chromium.org,cjhopman@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=375431,359249
Review URL: https://codereview.chromium.org/314363002
git-svn-id: http://src.chromium.org/svn/trunk/src/build@275436 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
> [Android] Generate localized strings.xml files at build time.
>
> This generates localized strings.xml files (e.g.
> values-fr/strings.xml) from grd and xtb files at build time. This
> means we no longer need to check in localized strings.xml files. Note:
> the xtb files are empty until translations are available.
>
> Benefits:
> - 41 fewer extraneous results when grepping Java string IDs
> - Switching from maintaining strings in strings.xml over to using a
> grd file is One Trivial CL* away: just include English in the list
> of languages for which we generate strings.xml files.
>
> *Restrictions may apply
>
> BUG=167248
>
> Review URL: https://codereview.chromium.org/11659006TBR=newt@chromium.org
Review URL: https://codereview.chromium.org/11820058
git-svn-id: http://src.chromium.org/svn/trunk/src/build@176151 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This generates localized strings.xml files (e.g.
values-fr/strings.xml) from grd and xtb files at build time. This
means we no longer need to check in localized strings.xml files. Note:
the xtb files are empty until translations are available.
Benefits:
- 41 fewer extraneous results when grepping Java string IDs
- Switching from maintaining strings in strings.xml over to using a
grd file is One Trivial CL* away: just include English in the list
of languages for which we generate strings.xml files.
*Restrictions may apply
BUG=167248
Review URL: https://codereview.chromium.org/11659006
git-svn-id: http://src.chromium.org/svn/trunk/src/build@176134 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
Previously all strings were in messages.json files. Moving them to GRD
file will allow to share them with native components. Also simplified
how resources are generated:
1. Now <if> is used to handle branded strings instead of generating
grd file in build time
2. Removed resource_ids - ids are now specified in grd files.
BUG=158995
Review URL: https://chromiumcodereview.appspot.com/11275101
git-svn-id: http://src.chromium.org/svn/trunk/src/build@166127 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
Previously all strings were in messages.json files. Moving them to GRD
file will allow to share them with native components. Also simplified
how resources are generated:
1. Now <if> is used to handle branded strings instead of generating
grd file in build time
2. Removed resource_ids - ids are now specified in grd files.
BUG=158995
Review URL: https://codereview.chromium.org/11275101
git-svn-id: http://src.chromium.org/svn/trunk/src/build@166068 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
Previously all strings were in messages.json files. Moving them to GRD
file will allow to share them with native components. Also simplified
how resources are generated:
1. Now <if> is used to handle branded strings instead of generating
grd file in build time
2. Removed resource_ids - ids are now specified in grd files.
BUG=158995
Review URL: https://codereview.chromium.org/11275101
git-svn-id: http://src.chromium.org/svn/trunk/src/build@166003 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
When chromoting resources were converted from messages.json to .grd format
incorrect branding was used. Beside that simplified how resources are
generated:
1. Now <if> is used to handle branded strings instead of generating grd file in build time
2. Removed resource_ids - ids are now specified in grd files.
BUG=158995
Review URL: https://chromiumcodereview.appspot.com/11275101
git-svn-id: http://src.chromium.org/svn/trunk/src/build@165605 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
- Add two gypi files to src/build for the boilerplate added to targets and actions
- Update grit_info to also support the -E flag so it can share more of the grit build commandline
- switch over all but the webkit and webkit glue grd files to use the common support
BUG=22247
TEST=everything still localized correctly
Review URL: http://codereview.chromium.org/6705030
git-svn-id: http://src.chromium.org/svn/trunk/src/build@79548 4ff67af0-8c30-449e-8e8b-ad334ec8d88c