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

Side by Side Diff: rlz/rlz.gyp

Issue 11361057: [cros] Add RecursiveLock for CrOS implementation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge Created 8 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 | « rlz/lib/recursive_lock_unittest.cc ('k') | 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 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 'variables': { 8 'variables': {
9 # Force rlz to use chrome's networking stack. 9 # Force rlz to use chrome's networking stack.
10 'force_rlz_use_chrome_net%': 1, 10 'force_rlz_use_chrome_net%': 1,
(...skipping 24 matching lines...) Expand all
35 'lib/assert.h', 35 'lib/assert.h',
36 'lib/crc32.h', 36 'lib/crc32.h',
37 'lib/crc32_wrapper.cc', 37 'lib/crc32_wrapper.cc',
38 'lib/crc8.h', 38 'lib/crc8.h',
39 'lib/crc8.cc', 39 'lib/crc8.cc',
40 'lib/financial_ping.cc', 40 'lib/financial_ping.cc',
41 'lib/financial_ping.h', 41 'lib/financial_ping.h',
42 'lib/lib_values.cc', 42 'lib/lib_values.cc',
43 'lib/machine_id.cc', 43 'lib/machine_id.cc',
44 'lib/machine_id.h', 44 'lib/machine_id.h',
45 'lib/recursive_lock.cc',
46 'lib/recursive_lock.h',
45 'lib/rlz_enums.h', 47 'lib/rlz_enums.h',
46 'lib/rlz_lib.cc', 48 'lib/rlz_lib.cc',
47 'lib/rlz_lib.h', 49 'lib/rlz_lib.h',
48 'lib/rlz_lib_clear.cc', 50 'lib/rlz_lib_clear.cc',
49 'lib/lib_values.h', 51 'lib/lib_values.h',
50 'lib/rlz_value_store.h', 52 'lib/rlz_value_store.h',
51 'lib/string_utils.cc', 53 'lib/string_utils.cc',
52 'lib/string_utils.h', 54 'lib/string_utils.h',
53 'mac/lib/machine_id_mac.cc', 55 'mac/lib/machine_id_mac.cc',
54 'mac/lib/rlz_value_store_mac.mm', 56 'mac/lib/rlz_value_store_mac.mm',
(...skipping 30 matching lines...) Expand all
85 }, { 87 }, {
86 'defines': [ 88 'defines': [
87 'RLZ_NETWORK_IMPLEMENTATION_WIN_INET', 89 'RLZ_NETWORK_IMPLEMENTATION_WIN_INET',
88 ], 90 ],
89 'direct_dependent_settings': { 91 'direct_dependent_settings': {
90 'defines': [ 92 'defines': [
91 'RLZ_NETWORK_IMPLEMENTATION_WIN_INET', 93 'RLZ_NETWORK_IMPLEMENTATION_WIN_INET',
92 ], 94 ],
93 }, 95 },
94 }], 96 }],
97 ['chromeos==0', {
98 'sources!': [
99 'lib/recursive_lock.cc',
100 'lib/recursive_lock.h',
101 ]
102 }],
95 ], 103 ],
96 }, 104 },
97 { 105 {
98 'target_name': 'rlz_unittests', 106 'target_name': 'rlz_unittests',
99 'type': 'executable', 107 'type': 'executable',
100 'dependencies': [ 108 'dependencies': [
101 ':rlz_lib', 109 ':rlz_lib',
102 '../base/base.gyp:base', 110 '../base/base.gyp:base',
103 '../testing/gmock.gyp:gmock', 111 '../testing/gmock.gyp:gmock',
104 '../testing/gtest.gyp:gtest', 112 '../testing/gtest.gyp:gtest',
105 '../third_party/zlib/zlib.gyp:zlib', 113 '../third_party/zlib/zlib.gyp:zlib',
106 ], 114 ],
107 'sources': [ 115 'sources': [
108 'lib/crc32_unittest.cc', 116 'lib/crc32_unittest.cc',
109 'lib/crc8_unittest.cc', 117 'lib/crc8_unittest.cc',
110 'lib/financial_ping_test.cc', 118 'lib/financial_ping_test.cc',
111 'lib/lib_values_unittest.cc', 119 'lib/lib_values_unittest.cc',
112 'lib/machine_id_unittest.cc', 120 'lib/machine_id_unittest.cc',
121 'lib/recursive_lock_unittest.cc',
113 'lib/rlz_lib_test.cc', 122 'lib/rlz_lib_test.cc',
114 'lib/string_utils_unittest.cc', 123 'lib/string_utils_unittest.cc',
115 'test/rlz_test_helpers.cc', 124 'test/rlz_test_helpers.cc',
116 'test/rlz_test_helpers.h', 125 'test/rlz_test_helpers.h',
117 'test/rlz_unittest_main.cc', 126 'test/rlz_unittest_main.cc',
118 'win/lib/machine_deal_test.cc', 127 'win/lib/machine_deal_test.cc',
119 ], 128 ],
120 'conditions': [ 129 'conditions': [
121 ['rlz_use_chrome_net==1', { 130 ['rlz_use_chrome_net==1', {
122 'dependencies': [ 131 'dependencies': [
123 '../net/net.gyp:net_test_support', 132 '../net/net.gyp:net_test_support',
124 ], 133 ],
134 }],
135 ['chromeos==0', {
136 'sources!': [
137 'lib/recursive_lock_unittest.cc',
138 ],
125 }] 139 }]
126 ], 140 ],
127 }, 141 },
128 { 142 {
129 'target_name': 'rlz_id', 143 'target_name': 'rlz_id',
130 'type': 'executable', 144 'type': 'executable',
131 'dependencies': [ 145 'dependencies': [
132 ':rlz_lib', 146 ':rlz_lib',
133 ], 147 ],
134 'sources': [ 148 'sources': [
(...skipping 13 matching lines...) Expand all
148 ], 162 ],
149 'dependencies': [ 163 'dependencies': [
150 ':rlz_lib', 164 ':rlz_lib',
151 '../third_party/zlib/zlib.gyp:zlib', 165 '../third_party/zlib/zlib.gyp:zlib',
152 ], 166 ],
153 }, 167 },
154 ], 168 ],
155 }], 169 }],
156 ], 170 ],
157 } 171 }
OLDNEW
« no previous file with comments | « rlz/lib/recursive_lock_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698