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

Side by Side Diff: chrome/unit_tests.isolate

Issue 14907003: Build libpeerconnection as a loadable module for win, mac and linux by default. Also remove the all… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add support for loading the .so from the build layout. Created 7 years, 7 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/sync_integration_tests.isolate ('k') | content/content_browsertests.isolate » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 { 4 {
5 'conditions': [ 5 'conditions': [
6 ['OS=="linux"', { 6 ['OS=="linux"', {
7 'variables': { 7 'variables': {
8 'command': [ 8 'command': [
9 '../testing/xvfb.py', 9 '../testing/xvfb.py',
10 '<(PRODUCT_DIR)', 10 '<(PRODUCT_DIR)',
11 '../tools/swarm_client/run_test_cases.py', 11 '../tools/swarm_client/run_test_cases.py',
12 '<(PRODUCT_DIR)/unit_tests<(EXECUTABLE_SUFFIX)', 12 '<(PRODUCT_DIR)/unit_tests<(EXECUTABLE_SUFFIX)',
13 ], 13 ],
14 'isolate_dependency_tracked': [ 14 'isolate_dependency_tracked': [
15 '../testing/xvfb.py', 15 '../testing/xvfb.py',
16 '<(PRODUCT_DIR)/chrome.pak', 16 '<(PRODUCT_DIR)/chrome.pak',
17 '<(PRODUCT_DIR)/lib/libpeerconnection.so',
17 '<(PRODUCT_DIR)/libffmpegsumo.so', 18 '<(PRODUCT_DIR)/libffmpegsumo.so',
18 '<(PRODUCT_DIR)/locales/fr.pak', 19 '<(PRODUCT_DIR)/locales/fr.pak',
19 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', 20 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
20 ], 21 ],
21 'isolate_dependency_untracked': [ 22 'isolate_dependency_untracked': [
22 '<(PRODUCT_DIR)/test_data/', 23 '<(PRODUCT_DIR)/test_data/',
23 ], 24 ],
24 'isolate_dependency_touched': [ 25 'isolate_dependency_touched': [
25 '<(PRODUCT_DIR)/libppGoogleNaClPluginChrome.so', 26 '<(PRODUCT_DIR)/libppGoogleNaClPluginChrome.so',
26 ], 27 ],
(...skipping 29 matching lines...) Expand all
56 'isolate_dependency_tracked': [ 57 'isolate_dependency_tracked': [
57 '<(PRODUCT_DIR)/chrome_100_percent.pak', 58 '<(PRODUCT_DIR)/chrome_100_percent.pak',
58 '<(PRODUCT_DIR)/locales/en-US.pak', 59 '<(PRODUCT_DIR)/locales/en-US.pak',
59 ], 60 ],
60 }, 61 },
61 }], 62 }],
62 ['OS=="mac"', { 63 ['OS=="mac"', {
63 'variables': { 64 'variables': {
64 'isolate_dependency_tracked': [ 65 'isolate_dependency_tracked': [
65 '<(PRODUCT_DIR)/ffmpegsumo.so', 66 '<(PRODUCT_DIR)/ffmpegsumo.so',
67 '<(PRODUCT_DIR)/libpeerconnection.so',
66 ], 68 ],
67 'isolate_dependency_untracked': [ 69 'isolate_dependency_untracked': [
68 '<(PRODUCT_DIR)/Chromium Framework.framework/', 70 '<(PRODUCT_DIR)/Chromium Framework.framework/',
69 ], 71 ],
70 }, 72 },
71 }], 73 }],
72 ['OS=="mac" or OS=="win"', { 74 ['OS=="mac" or OS=="win"', {
73 'variables': { 75 'variables': {
74 'command': [ 76 'command': [
75 '../testing/test_env.py', 77 '../testing/test_env.py',
76 '../tools/swarm_client/run_test_cases.py', 78 '../tools/swarm_client/run_test_cases.py',
77 '<(PRODUCT_DIR)/unit_tests<(EXECUTABLE_SUFFIX)', 79 '<(PRODUCT_DIR)/unit_tests<(EXECUTABLE_SUFFIX)',
78 ], 80 ],
79 'isolate_dependency_untracked': [ 81 'isolate_dependency_untracked': [
80 '<(PRODUCT_DIR)/test_data/chrome/browser/resources/print_preview/', 82 '<(PRODUCT_DIR)/test_data/chrome/browser/resources/print_preview/',
81 '<(PRODUCT_DIR)/test_data/chrome/test/data/unit/', 83 '<(PRODUCT_DIR)/test_data/chrome/test/data/unit/',
82 '<(PRODUCT_DIR)/test_data/ui/', 84 '<(PRODUCT_DIR)/test_data/ui/',
83 ], 85 ],
84 }, 86 },
85 }], 87 }],
86 ['OS=="win"', { 88 ['OS=="win"', {
87 'variables': { 89 'variables': {
88 'isolate_dependency_tracked': [ 90 'isolate_dependency_tracked': [
89 '<(PRODUCT_DIR)/ffmpegsumo.dll', 91 '<(PRODUCT_DIR)/ffmpegsumo.dll',
90 '<(PRODUCT_DIR)/icudt.dll', 92 '<(PRODUCT_DIR)/icudt.dll',
93 '<(PRODUCT_DIR)/libpeerconnection.dll',
91 ], 94 ],
92 'isolate_dependency_untracked': [ 95 'isolate_dependency_untracked': [
93 '../ppapi/lib/gl/include/KHR/', 96 '../ppapi/lib/gl/include/KHR/',
94 '../skia/ext/data/', 97 '../skia/ext/data/',
95 '../third_party/python_26/', 98 '../third_party/python_26/',
96 '../ui/base/glib/', 99 '../ui/base/glib/',
97 ], 100 ],
98 }, 101 },
99 }], 102 }],
100 ], 103 ],
101 } 104 }
OLDNEW
« no previous file with comments | « chrome/sync_integration_tests.isolate ('k') | content/content_browsertests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698