athena/resources/athena_resources.gyp - Issue 398243002: Fix the path to blink_resources.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: athena/resources/athena_resources.gyp

Issue 398243002: Fix the path to blink_resources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: REBASE Created 6 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: athena/resources/athena_resources.gyp

diff --git a/athena/resources/athena_resources.gyp b/athena/resources/athena_resources.gyp

index c836d59c205409a02b3da54733566428dfc85ed5..5bac5485111fc639d5decc8b4a28d34a6eeb0b2f 100644

--- a/athena/resources/athena_resources.gyp

+++ b/athena/resources/athena_resources.gyp

@@ -14,7 +14,7 @@

'../../ash/ash_resources.gyp:ash_resources',

'../../content/content_resources.gyp:content_resources',

'../../extensions/shell/app_shell.gyp:app_shell_pak',

- '../../webkit/webkit_resources.gyp:webkit_resources',

+ '../../third_party/WebKit/public/blink_resources.gyp:blink_resources',

'../../webkit/webkit_resources.gyp:webkit_strings',

'actions': [{

@@ -23,8 +23,8 @@

'pak_inputs': [

'<(PRODUCT_DIR)/app_shell.pak',

'<(SHARED_INTERMEDIATE_DIR)/ash/resources/ash_resources_100_percent.pak',

+ '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources.pak',

'<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak',

- '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.pak',

'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak',

'pak_output': '<(PRODUCT_DIR)/athena_resources.pak',

« no previous file with comments | « android_webview/android_webview.gyp ('k') | chrome/chrome_repack_resources.gypi » ('j') | no next file with comments »