diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-11 19:23:19 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-11 19:23:19 +0000 |
| commit | a3c13435c27b7dfcac1e60123576a226dbd18bf1 (patch) | |
| tree | 979b7f3fd4c290385ddaf29a507bc5d109e82618 /android_webview/android_webview.gyp | |
| parent | 055f8f2f3f0c69d390f1f0db5af6021e17daa712 (diff) | |
| download | chromium_src-a3c13435c27b7dfcac1e60123576a226dbd18bf1.zip chromium_src-a3c13435c27b7dfcac1e60123576a226dbd18bf1.tar.gz chromium_src-a3c13435c27b7dfcac1e60123576a226dbd18bf1.tar.bz2 | |
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
BUG=
Review URL: https://codereview.chromium.org/381113004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282663 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/android_webview.gyp')
| -rw-r--r-- | android_webview/android_webview.gyp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp index 2efc46c..e56399d 100644 --- a/android_webview/android_webview.gyp +++ b/android_webview/android_webview.gyp @@ -74,7 +74,7 @@ 'pak_inputs': [ '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', - '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak', + '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pak', ], @@ -115,7 +115,7 @@ 'include_dirs': [ '..', '../skia/config', - '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/', + '<(SHARED_INTERMEDIATE_DIR)/ui/resources/', ], 'sources': [ 'browser/aw_browser_context.cc', |