Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(834)

Unified Diff: components/components_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:
View side-by-side diff with in-line comments
Download patch
Index: components/components_tests.gyp
diff --git a/components/components_tests.gyp b/components/components_tests.gyp
index 032df73ba40ae2e2e55899c64cea053e1b81dc04..fcd1021e89fbd086338e30b36bd30c58f7bb10b8 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -1465,14 +1465,14 @@
'dependencies': [
'components_browsertests',
],
- 'copies': [
- {
- 'destination': '<(PRODUCT_DIR)/components_browsertests_apk_shell/assets',
- 'files': [
- '<@(components_browsertests_pak_input_resources)',
- ],
- }
- ],
+ 'variables': {
+ 'dest_path': '<(PRODUCT_DIR)/components_browsertests_apk_shell/assets',
+ 'src_files': [
+ '<@(components_browsertests_pak_input_resources)',
+ ],
+ 'clear': 1,
+ },
+ 'includes': ['../build/android/copy_ex.gypi'],
},
{
'target_name': 'components_browsertests_manifest',
@@ -1505,13 +1505,13 @@
'conditions': [
['icu_use_data_file_flag==1', {
'additional_input_paths': [
- '<(PRODUCT_DIR)/icudtl.dat',
+ '<(asset_location)/icudtl.dat',
],
}],
['v8_use_external_startup_data==1', {
'additional_input_paths': [
- '<(PRODUCT_DIR)/natives_blob.bin',
- '<(PRODUCT_DIR)/snapshot_blob.bin',
+ '<(asset_location)/natives_blob.bin',
+ '<(asset_location)/snapshot_blob.bin',
],
}],
],
« no previous file with comments | « chromecast/chromecast.gyp ('k') | content/content.gyp » ('j') | content/content_shell.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698