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

Side by Side Diff: components/components_unittests.isolate

Issue 1141703002: Chromium changes for static linking ffmpeg (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Tweaking our x86inc.asm Created 5 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
OLDNEW
1 # Copyright 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 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)/components_unittests<(EXECUTABLE_SUFFIX)', 10 '<(PRODUCT_DIR)/components_unittests<(EXECUTABLE_SUFFIX)',
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 'variables': { 46 'variables': {
47 'files': [ 47 'files': [
48 '../testing/test_env.py', 48 '../testing/test_env.py',
49 '<(PRODUCT_DIR)/components_unittests<(EXECUTABLE_SUFFIX)', 49 '<(PRODUCT_DIR)/components_unittests<(EXECUTABLE_SUFFIX)',
50 ], 50 ],
51 }, 51 },
52 }], 52 }],
53 ['OS=="linux"', { 53 ['OS=="linux"', {
54 'variables': { 54 'variables': {
55 'files': [ 55 'files': [
56 '<(PRODUCT_DIR)/libffmpegsumo.so',
57 '<(PRODUCT_DIR)/libosmesa.so', 56 '<(PRODUCT_DIR)/libosmesa.so',
58 ], 57 ],
59 }, 58 },
60 }], 59 }],
61 ['OS=="mac"', { 60 ['OS=="mac"', {
62 'variables': { 61 'variables': {
63 'files': [ 62 'files': [
64 '<(PRODUCT_DIR)/ffmpegsumo.so',
65 '<(PRODUCT_DIR)/osmesa.so', 63 '<(PRODUCT_DIR)/osmesa.so',
66 ], 64 ],
67 }, 65 },
68 }], 66 }],
69 ['OS=="win"', { 67 ['OS=="win"', {
70 'variables': { 68 'variables': {
71 'files': [ 69 'files': [
72 '../chrome/test/data/policy/', 70 '../chrome/test/data/policy/',
73 '<(PRODUCT_DIR)/ffmpegsumo.dll',
74 '<(PRODUCT_DIR)/osmesa.dll', 71 '<(PRODUCT_DIR)/osmesa.dll',
75 ], 72 ],
76 }, 73 },
77 }], 74 }],
78 ['OS=="win" and (fastbuild==0 or fastbuild==1)', { 75 ['OS=="win" and (fastbuild==0 or fastbuild==1)', {
79 'variables': { 76 'variables': {
80 'files': [ 77 'files': [
81 '<(PRODUCT_DIR)/components_unittests.exe.pdb', 78 '<(PRODUCT_DIR)/components_unittests.exe.pdb',
82 ], 79 ],
83 }, 80 },
84 }], 81 }],
85 ['OS=="mac" and asan==1 and fastbuild==0', { 82 ['OS=="mac" and asan==1 and fastbuild==0', {
86 'variables': { 83 'variables': {
87 'files': [ 84 'files': [
88 '<(PRODUCT_DIR)/components_unittests.dSYM/', 85 '<(PRODUCT_DIR)/components_unittests.dSYM/',
89 '<(PRODUCT_DIR)/ffmpegsumo.so.dSYM/',
90 '<(PRODUCT_DIR)/osmesa.so.dSYM/', 86 '<(PRODUCT_DIR)/osmesa.so.dSYM/',
91 ], 87 ],
92 }, 88 },
93 }], 89 }],
94 ], 90 ],
95 'includes': [ 91 'includes': [
96 '../base/base.isolate', 92 '../base/base.isolate',
97 '../third_party/angle/angle.isolate', 93 '../third_party/angle/angle.isolate',
98 ], 94 ],
99 } 95 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698