diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-10 16:56:07 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-10 16:56:07 +0000 |
| commit | 5c5b8bf111701f23caeb867b76fb16d9b4684c30 (patch) | |
| tree | b6f19219b98053619930f3d304768d6c33dd49bf /chrome/chrome_browser.gypi | |
| parent | f04dc7be24de4f01e2f9d16a2296de56dba02de5 (diff) | |
| download | chromium_src-5c5b8bf111701f23caeb867b76fb16d9b4684c30.zip chromium_src-5c5b8bf111701f23caeb867b76fb16d9b4684c30.tar.gz chromium_src-5c5b8bf111701f23caeb867b76fb16d9b4684c30.tar.bz2 | |
Revert 282355 "Add chrome/browser/ui to the GN build."
> Add chrome/browser/ui to the GN build.
>
> This moves the intermediate grit files:
> ui/ui_resources -> ui/resources
> ui/ui_strings -> ui/strings
> in the GYP build to put it in line with the GN one (and also what one would expect).
>
> R=ajwong@chromium.org
>
> Review URL: https://codereview.chromium.org/381463002
TBR=brettw@chromium.org
Review URL: https://codereview.chromium.org/387573003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282359 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_browser.gypi')
| -rw-r--r-- | chrome/chrome_browser.gypi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 11698a0..784fb33 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -2974,7 +2974,7 @@ # These files are generated by GRIT. '<(grit_out_dir)/grit/component_extension_resources_map.cc', '<(grit_out_dir)/grit/theme_resources_map.cc', - '<(SHARED_INTERMEDIATE_DIR)/ui/resources/grit/ui_resources_map.cc', + '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/grit/ui_resources_map.cc', # This file is generated by # chrome/browser/metrics/variations/generate_resources_map.py |