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

Side by Side Diff: media/cast/cast.gyp

Issue 69603002: Incorporating logging into Cast (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Adding scoped_ptr include Created 7 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 | Annotate | Revision Log
« no previous file with comments | « media/cast/audio_sender/audio_sender_unittest.cc ('k') | media/cast/cast_defines.h » ('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 2013 The Chromium Authors. All rights reserved. 1 # Copyright 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 { 5 {
6 'variables': { 6 'variables': {
7 'include_tests%': 1, 7 'include_tests%': 1,
8 'chromium_code': 1, 8 'chromium_code': 1,
9 }, 9 },
10 'targets': [ 10 'targets': [
11 { 11 {
12 'target_name': 'cast_config', 12 'target_name': 'cast_config',
13 'type': 'static_library', 13 'type': 'static_library',
14 'include_dirs': [ 14 'include_dirs': [
15 '<(DEPTH)/', 15 '<(DEPTH)/',
16 ], 16 ],
17 'dependencies': [
18 '<(DEPTH)/base/base.gyp:base',
19 # '<(DEPTH)/base/base.gyp:test_support_base',
20 ],
17 'sources': [ 21 'sources': [
18 'cast_config.cc', 22 'cast_config.cc',
19 'cast_config.h', 23 'cast_config.h',
20 'cast_environment.cc', 24 'cast_environment.cc',
21 'cast_environment.h', 25 'cast_environment.h',
26 'logging/logging_defines.cc',
27 'logging/logging_defines.h',
28 'logging/logging_impl.cc',
29 'logging/logging_impl.h',
30 'logging/logging_raw.cc',
31 'logging/logging_raw.h',
32 'logging/logging_stats.cc',
33 'logging/logging_stats.h',
22 ], # source 34 ], # source
23 }, 35 },
24 ], # targets, 36 ], # targets,
25 'conditions': [ 37 'conditions': [
26 ['include_tests==1', { 38 ['include_tests==1', {
27 'targets': [ 39 'targets': [
28 { 40 {
29 'target_name': 'cast_unittests', 41 'target_name': 'cast_unittests',
30 'type': '<(gtest_target_type)', 42 'type': '<(gtest_target_type)',
31 'dependencies': [ 43 'dependencies': [
32 'cast_config', 44 'cast_config',
33 'cast_receiver.gyp:cast_receiver', 45 'cast_receiver.gyp:cast_receiver',
34 'cast_sender.gyp:cast_sender', 46 'cast_sender.gyp:cast_sender',
35 'logging/logging.gyp:cast_logging',
36 'test/utility/utility.gyp:cast_test_utility', 47 'test/utility/utility.gyp:cast_test_utility',
37 '<(DEPTH)/base/base.gyp:run_all_unittests', 48 '<(DEPTH)/base/base.gyp:run_all_unittests',
38 '<(DEPTH)/crypto/crypto.gyp:crypto', 49 '<(DEPTH)/crypto/crypto.gyp:crypto',
39 '<(DEPTH)/net/net.gyp:net', 50 '<(DEPTH)/net/net.gyp:net',
40 '<(DEPTH)/testing/gmock.gyp:gmock', 51 '<(DEPTH)/testing/gmock.gyp:gmock',
41 '<(DEPTH)/testing/gtest.gyp:gtest', 52 '<(DEPTH)/testing/gtest.gyp:gtest',
42 ], 53 ],
43 'include_dirs': [ 54 'include_dirs': [
44 '<(DEPTH)/', 55 '<(DEPTH)/',
45 '<(DEPTH)/third_party/', 56 '<(DEPTH)/third_party/',
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 '-lXext', 147 '-lXext',
137 '-lX11', 148 '-lX11',
138 ], 149 ],
139 }], 150 }],
140 ], 151 ],
141 }, 152 },
142 ], # targets 153 ], # targets
143 }], # include_tests 154 }], # include_tests
144 ], 155 ],
145 } 156 }
OLDNEW
« no previous file with comments | « media/cast/audio_sender/audio_sender_unittest.cc ('k') | media/cast/cast_defines.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698