net/net.gyp - Issue 1422793004: Reland Reland Switch Chrome Android using v8 arch specific external data name

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: net/net.gyp

Issue 1422793004: Reland Reland Switch Chrome Android using v8 arch specific external data name (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 1 month ago

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

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: net/net.gyp

diff --git a/net/net.gyp b/net/net.gyp

index a4536a9f047b5c34a310986ec5c12c6181724bca..4231043980f700bdaa98f95048aea53c3519ebaf 100644

--- a/net/net.gyp

+++ b/net/net.gyp

@@ -1527,10 +1527,14 @@

'variables': {

'dest_path': '<(asset_location)',

- 'src_files': [

+ 'renaming_sources': [

'<(PRODUCT_DIR)/natives_blob.bin',

'<(PRODUCT_DIR)/snapshot_blob.bin',

+ 'renaming_destinations': [

+ 'natives_blob_<(arch_suffix).bin',

+ 'snapshot_blob_<(arch_suffix).bin',

+ ],

'clear': 1,

'includes': ['../build/android/copy_ex.gypi'],

@@ -1545,13 +1549,16 @@

['v8_use_external_startup_data==1', {

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

'additional_input_paths': [

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

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

+ '<(PRODUCT_DIR)/net_unittests_apk/assets/natives_blob_<(arch_suffix).bin',

+ '<(PRODUCT_DIR)/net_unittests_apk/assets/snapshot_blob_<(arch_suffix).bin',

}],

- 'includes': [ '../build/apk_test.gypi' ],

+ 'includes': [

+ '../build/apk_test.gypi',

+ '../build/android/v8_external_startup_data_arch_suffix.gypi',

+ ],

{

'target_name': 'net_junit_tests',

« no previous file with comments | « gin/v8_initializer.cc ('k') | third_party/WebKit/Source/platform/blink_platform_tests.gyp » ('j') | no next file with comments »