third_party/WebKit/Source/web/web_tests.gyp - Issue 1424983004: Using copy_ex to copy assets

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: third_party/WebKit/Source/web/web_tests.gyp

Issue 1424983004: Using copy_ex to copy assets (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: remvoe build log Created 5 years, 2 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: third_party/WebKit/Source/web/web_tests.gyp

diff --git a/third_party/WebKit/Source/web/web_tests.gyp b/third_party/WebKit/Source/web/web_tests.gyp

index b4277c8a1cf5a3de2dd893a2061efe5657811da9..f036b66ece58b5ec6a01930282b97e001dc6457c 100644

--- a/third_party/WebKit/Source/web/web_tests.gyp

+++ b/third_party/WebKit/Source/web/web_tests.gyp

@@ -141,28 +141,20 @@

'type': 'none',

'dependencies': [

'<(DEPTH)/base/base.gyp:base_java',

- '<(DEPTH)/content/content_shell_and_tests.gyp:content_shell_pak',

+ '<(DEPTH)/content/content.gyp:content_shell_assets_copy',

'<(DEPTH)/net/net.gyp:net_java',

'webkit_unit_tests',

- 'conditions': [

- ['v8_use_external_startup_data==1', {

- 'dependencies': [

- '<(DEPTH)/v8/tools/gyp/v8.gyp:v8_external_snapshot',

- '<(DEPTH)/content/content.gyp:content_v8_external_data',

- ],

- }],

- ],

'variables': {

'test_suite_name': 'webkit_unit_tests',

'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)webkit_unit_tests<(SHARED_LIB_SUFFIX)',

- 'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/content_shell.pak'],

+ 'additional_input_paths': ['<(asset_location)/content_shell.pak'],

'asset_location': '<(PRODUCT_DIR)/content_shell/assets',

'conditions': [

['v8_use_external_startup_data==1', {

'additional_input_paths': [

- '<(PRODUCT_DIR)/content_shell/assets/natives_blob.bin',

- '<(PRODUCT_DIR)/content_shell/assets/snapshot_blob.bin',

+ '<(asset_location)/natives_blob.bin',

+ '<(asset_location)/snapshot_blob.bin',

}],