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

Side by Side Diff: content/content_unittests.isolate

Issue 636283010: Fix regression while I worked on removing support for isolate_dependency_tracked. (Closed) Base URL: https://chromium.googlesource.com/a/chromium/src.git@master
Patch Set: Created 6 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | 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) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 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=="android" or OS=="linux" or OS=="mac" or OS=="win"', { 6 ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', {
7 'variables': { 7 'variables': {
8 'files': [ 8 'files': [
9 '../media/test/data/', 9 '../media/test/data/',
10 'test/data/', 10 'test/data/',
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 }], 53 }],
54 ['OS=="linux" and use_ozone==0', { 54 ['OS=="linux" and use_ozone==0', {
55 'variables': { 55 'variables': {
56 'files': [ 56 'files': [
57 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', 57 '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
58 ], 58 ],
59 }, 59 },
60 }], 60 }],
61 ['OS=="linux" and libpeer_target_type=="loadable_module"', { 61 ['OS=="linux" and libpeer_target_type=="loadable_module"', {
62 'variables': { 62 'variables': {
63 'isolate_dependency_tracked': [ 63 'files': [
64 '<(PRODUCT_DIR)/lib/libpeerconnection.so', 64 '<(PRODUCT_DIR)/lib/libpeerconnection.so',
65 ], 65 ],
66 }, 66 },
67 }], 67 }],
68 ['OS=="mac"', { 68 ['OS=="mac"', {
69 'variables': { 69 'variables': {
70 'command': [ 70 'command': [
71 '../testing/test_env.py', 71 '../testing/test_env.py',
72 '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)', 72 '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)',
73 '--brave-new-test-launcher', 73 '--brave-new-test-launcher',
(...skipping 25 matching lines...) Expand all
99 }], 99 }],
100 ['OS=="win" and (fastbuild==0 or fastbuild==1)', { 100 ['OS=="win" and (fastbuild==0 or fastbuild==1)', {
101 'variables': { 101 'variables': {
102 'files': [ 102 'files': [
103 '<(PRODUCT_DIR)/content_unittests.exe.pdb', 103 '<(PRODUCT_DIR)/content_unittests.exe.pdb',
104 ], 104 ],
105 }, 105 },
106 }], 106 }],
107 ['OS=="win" and libpeer_target_type=="loadable_module"', { 107 ['OS=="win" and libpeer_target_type=="loadable_module"', {
108 'variables': { 108 'variables': {
109 'isolate_dependency_tracked': [ 109 'files': [
110 '<(PRODUCT_DIR)/libpeerconnection.dll', 110 '<(PRODUCT_DIR)/libpeerconnection.dll',
111 ], 111 ],
112 }, 112 },
113 }], 113 }],
114 ], 114 ],
115 'includes': [ 115 'includes': [
116 '../base/base.isolate', 116 '../base/base.isolate',
117 ], 117 ],
118 } 118 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698