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

Side by Side Diff: ash/ash_unittests.isolate

Issue 1141703002: Chromium changes for static linking ffmpeg (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Roll DEPS to fix cros, rebase. Created 5 years, 6 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 | « DEPS ('k') | cc/cc_unittests.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) 2014 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2014 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 ['use_x11==0', { 6 ['use_x11==0', {
7 'variables': { 7 'variables': {
8 'command': [ 8 'command': [
9 '../testing/test_env.py', 9 '../testing/test_env.py',
10 '<(PRODUCT_DIR)/ash_unittests<(EXECUTABLE_SUFFIX)', 10 '<(PRODUCT_DIR)/ash_unittests<(EXECUTABLE_SUFFIX)',
(...skipping 23 matching lines...) Expand all
34 '<(PRODUCT_DIR)/chrome_100_percent.pak', 34 '<(PRODUCT_DIR)/chrome_100_percent.pak',
35 '<(PRODUCT_DIR)/chrome_200_percent.pak', 35 '<(PRODUCT_DIR)/chrome_200_percent.pak',
36 '<(PRODUCT_DIR)/locales/en-US.pak', 36 '<(PRODUCT_DIR)/locales/en-US.pak',
37 '<(PRODUCT_DIR)/keyboard_resources.pak', 37 '<(PRODUCT_DIR)/keyboard_resources.pak',
38 ], 38 ],
39 }, 39 },
40 }], 40 }],
41 ['OS=="linux"', { 41 ['OS=="linux"', {
42 'variables': { 42 'variables': {
43 'files': [ 43 'files': [
44 '<(PRODUCT_DIR)/libffmpegsumo.so',
45 '<(PRODUCT_DIR)/libosmesa.so', 44 '<(PRODUCT_DIR)/libosmesa.so',
46 ], 45 ],
47 }, 46 },
48 }], 47 }],
49 ['OS=="win"', { 48 ['OS=="win"', {
50 'variables': { 49 'variables': {
51 'files': [ 50 'files': [
52 '<(PRODUCT_DIR)/ffmpegsumo.dll',
53 '<(PRODUCT_DIR)/osmesa.dll', 51 '<(PRODUCT_DIR)/osmesa.dll',
54 ], 52 ],
55 }, 53 },
56 }], 54 }],
57 ['OS=="win" and (fastbuild==0 or fastbuild==1)', { 55 ['OS=="win" and (fastbuild==0 or fastbuild==1)', {
58 'variables': { 56 'variables': {
59 'files': [ 57 'files': [
60 '<(PRODUCT_DIR)/ash_unittests.exe.pdb', 58 '<(PRODUCT_DIR)/ash_unittests.exe.pdb',
61 ], 59 ],
62 }, 60 },
63 }], 61 }],
64 ], 62 ],
65 'includes': [ 63 'includes': [
66 '../base/base.isolate', 64 '../base/base.isolate',
67 '../third_party/angle/angle.isolate', 65 '../third_party/angle/angle.isolate',
68 ], 66 ],
69 } 67 }
OLDNEW
« no previous file with comments | « DEPS ('k') | cc/cc_unittests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698