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

Side by Side Diff: chrome/browser_tests.isolate

Issue 587503002: More fixes to make 32 bit Linux builds pass compile. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
« 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) 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 'includes': [ 5 'includes': [
6 'chrome.isolate', 6 'chrome.isolate',
7 ], 7 ],
8 'conditions': [ 8 'conditions': [
9 ['OS=="linux"', { 9 ['OS=="linux"', {
10 'variables': { 10 'variables': {
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 'test/data/', 71 'test/data/',
72 'third_party/mock4js/', 72 'third_party/mock4js/',
73 ], 73 ],
74 'read_only': 1, 74 'read_only': 1,
75 }, 75 },
76 }], 76 }],
77 ['OS=="linux" or OS=="win"', { 77 ['OS=="linux" or OS=="win"', {
78 'variables': { 78 'variables': {
79 'isolate_dependency_tracked': [ 79 'isolate_dependency_tracked': [
80 '<(PRODUCT_DIR)/mock_nacl_gdb<(EXECUTABLE_SUFFIX)', 80 '<(PRODUCT_DIR)/mock_nacl_gdb<(EXECUTABLE_SUFFIX)',
81 '<(PRODUCT_DIR)/ppapi_nacl_tests_glibc_x64.nexe',
82 '<(PRODUCT_DIR)/ppapi_nacl_tests_newlib_x64.nexe',
83 '<(PRODUCT_DIR)/ppapi_nacl_tests_pnacl_newlib_x64.nexe',
84 ], 81 ],
85 'isolate_dependency_untracked': [ 82 'isolate_dependency_untracked': [
86 '../third_party/bidichecker/', 83 '../third_party/bidichecker/',
87 ], 84 ],
88 }, 85 },
89 }], 86 }],
90 ['OS=="win" or (OS=="linux" and target_arch=="x64")', { 87 ['OS=="win" or (OS=="linux" and target_arch=="x64")', {
91 'variables': { 88 'variables': {
92 'isolate_dependency_tracked': [ 89 'isolate_dependency_tracked': [
93 '<(PRODUCT_DIR)/lib64/', 90 '<(PRODUCT_DIR)/lib64/',
91 '<(PRODUCT_DIR)/ppapi_nacl_tests_glibc_x64.nexe',
92 '<(PRODUCT_DIR)/ppapi_nacl_tests_newlib_x64.nexe',
93 '<(PRODUCT_DIR)/ppapi_nacl_tests_pnacl_newlib_x64.nexe',
94 ], 94 ],
95 }, 95 },
96 }], 96 }],
97 ['OS=="mac"', { 97 ['OS=="mac"', {
98 'variables': { 98 'variables': {
99 'isolate_dependency_tracked': [ 99 'isolate_dependency_tracked': [
100 '<(PRODUCT_DIR)/clearkeycdmadapter.plugin', 100 '<(PRODUCT_DIR)/clearkeycdmadapter.plugin',
101 '<(PRODUCT_DIR)/content_shell.pak', 101 '<(PRODUCT_DIR)/content_shell.pak',
102 '<(PRODUCT_DIR)/libclearkeycdm.dylib', 102 '<(PRODUCT_DIR)/libclearkeycdm.dylib',
103 '<(PRODUCT_DIR)/osmesa.so', 103 '<(PRODUCT_DIR)/osmesa.so',
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 '../ui/file_manager/file_manager/', 160 '../ui/file_manager/file_manager/',
161 '../ui/webui/resources/js/', 161 '../ui/webui/resources/js/',
162 '<(PRODUCT_DIR)/chromevox_test_data/', 162 '<(PRODUCT_DIR)/chromevox_test_data/',
163 '<(PRODUCT_DIR)/locales/', 163 '<(PRODUCT_DIR)/locales/',
164 '<(PRODUCT_DIR)/resources/chromeos/', 164 '<(PRODUCT_DIR)/resources/chromeos/',
165 ], 165 ],
166 }, 166 },
167 }], 167 }],
168 ], 168 ],
169 } 169 }
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