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

Side by Side Diff: SConstruct

Issue 3450005: Added crypto library to update_engine -l list so that it is explicitly passed to the linker. (Closed) Base URL: http://git.chromium.org/git/update_engine.git
Patch Set: Created 10 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 | Annotate | Revision Log
« 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) 2009 The Chromium OS Authors. All rights reserved. 1 # Copyright (c) 2009 The Chromium OS 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 import os 5 import os
6 6
7 # Protobuffer compilation 7 # Protobuffer compilation
8 def ProtocolBufferEmitter(target, source, env): 8 def ProtocolBufferEmitter(target, source, env):
9 """ Inputs: 9 """ Inputs:
10 target: list of targets to compile to 10 target: list of targets to compile to
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 -Wtype-limits 150 -Wtype-limits
151 -Wtype-limits 151 -Wtype-limits
152 -Wuninitialized 152 -Wuninitialized
153 -D__STDC_FORMAT_MACROS=1 153 -D__STDC_FORMAT_MACROS=1
154 -D_FILE_OFFSET_BITS=64 154 -D_FILE_OFFSET_BITS=64
155 -I/usr/include/libxml2""".split()); 155 -I/usr/include/libxml2""".split());
156 env['CCFLAGS'] += (' ' + ' '.join(env['CFLAGS'])) 156 env['CCFLAGS'] += (' ' + ' '.join(env['CFLAGS']))
157 157
158 env['LIBS'] = Split("""base 158 env['LIBS'] = Split("""base
159 bz2 159 bz2
160 crypto
160 curl 161 curl
161 gflags 162 gflags
162 glib-2.0 163 glib-2.0
163 gthread-2.0 164 gthread-2.0
164 libpcrecpp 165 libpcrecpp
165 metrics 166 metrics
166 protobuf 167 protobuf
167 pthread 168 pthread
168 rootdev 169 rootdev
169 ssl 170 ssl
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 delta_generator_main) 298 delta_generator_main)
298 299
299 http_server_cmd = env.Program('test_http_server', 'test_http_server.cc') 300 http_server_cmd = env.Program('test_http_server', 'test_http_server.cc')
300 301
301 unittest_env = env.Clone() 302 unittest_env = env.Clone()
302 unittest_env.Append(LIBS=['gmock', 'gtest']) 303 unittest_env.Append(LIBS=['gmock', 'gtest'])
303 unittest_cmd = unittest_env.Program('update_engine_unittests', 304 unittest_cmd = unittest_env.Program('update_engine_unittests',
304 unittest_sources + unittest_main) 305 unittest_sources + unittest_main)
305 Clean(unittest_cmd, Glob('*.gcda') + Glob('*.gcno') + Glob('*.gcov') + 306 Clean(unittest_cmd, Glob('*.gcda') + Glob('*.gcno') + Glob('*.gcov') +
306 Split('html app.info')) 307 Split('html app.info'))
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