Граф коммитов

29 Коммитов

Автор SHA1 Сообщение Дата
olivierrobin fd979b62bf Change grit whitelist to a string parameter
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
2015-02-09 17:05:22 +00:00
Nico Weber e0ab7c5025 grit: Use new --write-only-new flag.
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
2014-12-05 00:50:15 +00:00
cjhopman@chromium.org f622af532b [Second try] 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

Review URL: https://codereview.chromium.org/310313005

git-svn-id: http://src.chromium.org/svn/trunk/src/build@275645 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-06-07 08:28:03 +00:00
johnme@chromium.org 3a21696293 Revert of Add creation of v14 compatible resources to process_resources.py (https://codereview.chromium.org/321453002/)
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=275401

TBR=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
2014-06-06 14:23:28 +00:00
cjhopman@chromium.org fd4f1b695a 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

Review URL: https://codereview.chromium.org/321453002

git-svn-id: http://src.chromium.org/svn/trunk/src/build@275401 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-06-06 11:16:03 +00:00
aurimas@chromium.org e7050faf90 Add a new gyp flag to enable resource whitelist generation.
BUG=338759
NOTRY=true

Review URL: https://codereview.chromium.org/184783005

git-svn-id: http://src.chromium.org/svn/trunk/src/build@255710 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-03-07 22:36:32 +00:00
scottmg@chromium.org f9239b2372 Delete some msvs_cygwin_shell:0
This is the default, so these are no-ops.

TBR=thakis@chromium.org
BUG=123026

Review URL: https://codereview.chromium.org/141693007

git-svn-id: http://src.chromium.org/svn/trunk/src/build@247039 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-01-25 00:45:40 +00:00
phajdan.jr@chromium.org 47cd662058 Generate about:credits page automatically at build time.
This uses tools/licenses.py internally.

BUG=160424

Review URL: https://codereview.chromium.org/12177010

git-svn-id: http://src.chromium.org/svn/trunk/src/build@181293 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2013-02-07 13:32:13 +00:00
newt@chromium.org d42c015fc9 Specify location of resource_ids with DEPTH instead of GRIT_DIR.
This works around a MSVS bug which would change
'-f GRIT_DIR/../gritsettings/resource_ids' to '-f gritsettings/resource_ids'
and prepares for re-landing https://codereview.chromium.org/11659006/


Review URL: https://chromiumcodereview.appspot.com/11880050

git-svn-id: http://src.chromium.org/svn/trunk/src/build@177025 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2013-01-16 00:28:36 +00:00
newt@chromium.org 8b3ac4b321 Revert 176134
> [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/11659006

TBR=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
2013-01-10 21:05:48 +00:00
newt@chromium.org 7c4ca3e243 [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/11659006

git-svn-id: http://src.chromium.org/svn/trunk/src/build@176134 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2013-01-10 20:02:26 +00:00
sergeyu@chromium.org ff63a0a779 Move Chromoting strings to string_resources.grd and simplify remoting_resources target.
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
2012-11-06 03:39:19 +00:00
phajdan.jr@chromium.org 69a1067671 Revert "Move Chromoting strings to string_resources.grd and simplify remoting_resources target."
This reverts commit f5dfed801f9358411900c4f9ca58ef0a11cce9ae.

git-svn-id: http://src.chromium.org/svn/trunk/src/build@166069 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-11-05 23:32:12 +00:00
sergeyu@chromium.org d5f0ede00e Move Chromoting strings to string_resources.grd and simplify remoting_resources target.
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
2012-11-05 23:26:21 +00:00
sergeyu@chromium.org 0e2ccdaa18 Revert 166003 - Move Chromoting strings to string_resources.grd and simplify remoting_resources target.
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

TBR=sergeyu@chromium.org
Review URL: https://codereview.chromium.org/11365095

git-svn-id: http://src.chromium.org/svn/trunk/src/build@166013 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-11-05 20:17:54 +00:00
sergeyu@chromium.org 34f1df4e5e Move Chromoting strings to string_resources.grd and simplify remoting_resources target.
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
2012-11-05 19:55:59 +00:00
hbono@chromium.org 2d52ad1f25 Revert 165605 - Fix branding in chromoting string resources.
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

TBR=sergeyu@chromium.org
Review URL: https://codereview.chromium.org/11359035

git-svn-id: http://src.chromium.org/svn/trunk/src/build@165611 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-11-02 03:34:35 +00:00
sergeyu@chromium.org b847fb9aab Fix branding in chromoting string resources.
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
2012-11-02 02:54:01 +00:00
iannucci@chromium.org 6757e63719 Turn off cygwin for grit again.
Roll gyp has already been updated prevent the issues which happened previously with msvs 2008.

This is a second attempt at https://chromiumcodereview.appspot.com/10832121/
BUG=123026
R=scottmg,joi,thakis


Review URL: https://chromiumcodereview.appspot.com/10824268

git-svn-id: http://src.chromium.org/svn/trunk/src/build@152639 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-08-21 21:25:40 +00:00
scottmg@google.com 96d1d29b2f Revert 149892 - Remove cygwin disease from grit (python) invocations :)
(Try bots currently failing on pak build. Not sure that this is the cause, but
I don't see a lot of other plausible candidates. I'll revert this revert if it
doesn't help.)

R=scottmg,joi
BUG=123026

Review URL: https://chromiumcodereview.appspot.com/10832121

TBR=iannucci@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10834182

git-svn-id: http://src.chromium.org/svn/trunk/src/build@150118 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-08-06 18:31:33 +00:00
iannucci@chromium.org 553710b04e Remove cygwin disease from grit (python) invocations :)
R=scottmg,joi
BUG=123026

Review URL: https://chromiumcodereview.appspot.com/10832121

git-svn-id: http://src.chromium.org/svn/trunk/src/build@149892 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-08-03 19:41:51 +00:00
joi@chromium.org 7db4a827c9 Pick up and adjust to version of grit where default is no resource_ids file.
BUG=none

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=129619

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=129818

Review URL: https://chromiumcodereview.appspot.com/9875019

git-svn-id: http://src.chromium.org/svn/trunk/src/build@130115 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-04-02 10:21:01 +00:00
joi@chromium.org d49f6c1f74 Revert 129818 - Pick up and adjust to version of grit where default is no resource_ids file.
BUG=none

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=129619

Review URL: https://chromiumcodereview.appspot.com/9875019

TBR=joi@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9959009

git-svn-id: http://src.chromium.org/svn/trunk/src/build@129823 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-03-30 10:43:22 +00:00
joi@chromium.org e74886c3a8 Pick up and adjust to version of grit where default is no resource_ids file.
BUG=none

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=129619

Review URL: https://chromiumcodereview.appspot.com/9875019

git-svn-id: http://src.chromium.org/svn/trunk/src/build@129818 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-03-30 10:30:03 +00:00
joi@chromium.org 525bb608dd Revert 129619 - Pick up and adjust to version of grit where default is no resource_ids file.
BUG=none

Review URL: https://chromiumcodereview.appspot.com/9875019

TBR=joi@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9924007

git-svn-id: http://src.chromium.org/svn/trunk/src/build@129621 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-03-29 14:36:01 +00:00
joi@chromium.org f4ff6cd9d6 Pick up and adjust to version of grit where default is no resource_ids file.
BUG=none

Review URL: https://chromiumcodereview.appspot.com/9875019

git-svn-id: http://src.chromium.org/svn/trunk/src/build@129619 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-03-29 14:26:57 +00:00
tony@chromium.org c9ee63aad7 Remove the comments setting emands and vim tab width and expansion variables.
These were added in r28089 (http://codereview.chromium.org/256059) but
are unnecessary bloat for everyone to carry around, even those that don't
use emacs or vim.

In an earlier change, I added editor config files in src/tools/emacs/
and src/tools/vim/ so users of the appropriate editor can source those
instead.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/7310019

git-svn-id: http://src.chromium.org/svn/trunk/src/build@92046 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2011-07-11 20:22:46 +00:00
thakis@chromium.org ee2c506a4b Invoke grit_info as a python module.
This speeds up build/gyp_chromium by 7s on my system (for a total of 10s with the other grit_info changes I landed earlier).

BUG=82230
TEST=none


Review URL: http://codereview.chromium.org/7035004

git-svn-id: http://src.chromium.org/svn/trunk/src/build@87140 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2011-05-28 02:11:24 +00:00
thomasvl@chromium.org dba2c19be8 Standardize grit invokes
- 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
2011-03-28 12:01:29 +00:00