summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_repack_resources.gypi
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-25 07:49:59 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-25 07:49:59 +0000
commit1400d1d0af74957c230adc6b5633e092b962a4c0 (patch)
tree3b54821f554fb4bc27cd0ff94037997b91fd42d0 /chrome/chrome_repack_resources.gypi
parentb8f886cddd9b2128c81dd64602a6ca1af9e0bac2 (diff)
downloadchromium_src-1400d1d0af74957c230adc6b5633e092b962a4c0.zip
chromium_src-1400d1d0af74957c230adc6b5633e092b962a4c0.tar.gz
chromium_src-1400d1d0af74957c230adc6b5633e092b962a4c0.tar.bz2
Fix the path to blink_resources.
We added a new blink_resources.gyp file to Blink repo in order to get rid of blink_chromium_resources action from webkit_resources.gyp and make the migration easier in https://src.chromium.org/viewvc/blink?revision=178275&view=revision This updates the Chromium side to reference the new generated path. BUG=338338 TEST=None R=jamesr@chromium.org TBR=darin@chromium.org Review URL: https://codereview.chromium.org/398243002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285524 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_repack_resources.gypi')
-rw-r--r--chrome/chrome_repack_resources.gypi2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/chrome_repack_resources.gypi b/chrome/chrome_repack_resources.gypi
index 1017625..01b7834 100644
--- a/chrome/chrome_repack_resources.gypi
+++ b/chrome/chrome_repack_resources.gypi
@@ -28,11 +28,11 @@
}],
['OS != "ios"', {
'pak_inputs': [
+ '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/extensions/extensions_renderer_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/extensions/extensions_resources.pak',
- '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.pak',
],
}],
['OS != "ios" and OS != "android"', {