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

Side by Side Diff: SConstruct.chromiumos

Issue 6730052: Use chromeos::Process in libchromeos.a instead of g_spawn_async. (Closed) Base URL: http://git.chromium.org/git/cros.git@0.11.257.B
Patch Set: Created 9 years, 9 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 | chromeos_keyboard.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 (c) 2010 The Chromium OS Authors. All rights reserved. 1 # Copyright (c) 2010 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 import re 6 import re
7 import sys 7 import sys
8 8
9 def GlibMarshalEmitter(target, source, env): 9 def GlibMarshalEmitter(target, source, env):
10 """ Inputs: 10 """ Inputs:
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 chromeos_update.cc 111 chromeos_update.cc
112 chromeos_update_engine.cc 112 chromeos_update_engine.cc
113 libcros_service.cc 113 libcros_service.cc
114 libcros_servicer.cc 114 libcros_servicer.cc
115 marshal.glibmarshal.c 115 marshal.glibmarshal.c
116 network_proxy_resolver_handler.cc 116 network_proxy_resolver_handler.cc
117 version_check.cc 117 version_check.cc
118 ''') 118 ''')
119 119
120 env = base_env.Clone() 120 env = base_env.Clone()
121 env.Append(LIBS=['base', 'chromeos', 'rt', 'rootdev']) 121 env.Append(LIBS=['chromeos', 'base', 'rt', 'rootdev'])
122 122
123 # glib, dbus, and ibus environment 123 # glib, dbus, and ibus environment
124 env.ParseConfig('%s --cflags --libs dbus-1 glib-2.0 gudev-1.0 dbus-glib-1 ibus-1 .0 libpcrecpp x11' % env['ENV']['PKG_CONFIG']) 124 env.ParseConfig('%s --cflags --libs dbus-1 glib-2.0 gudev-1.0 dbus-glib-1 ibus-1 .0 libpcrecpp x11' % env['ENV']['PKG_CONFIG'])
125 125
126 env.GlibMarshal('marshal.glibmarshal.c', 'marshal.list') 126 env.GlibMarshal('marshal.glibmarshal.c', 'marshal.list')
127 127
128 ibus_component_dir = "%s%s" % (env['ENV']['SYSROOT'], 128 ibus_component_dir = "%s%s" % (env['ENV']['SYSROOT'],
129 '/usr/share/ibus/component/') 129 '/usr/share/ibus/component/')
130 ime_whitelist_file = env['ENV']['SYSROOT'] + '/usr/share/chromeos-assets/' + \ 130 ime_whitelist_file = env['ENV']['SYSROOT'] + '/usr/share/chromeos-assets/' + \
131 'input_methods/whitelist.txt' 131 'input_methods/whitelist.txt'
(...skipping 27 matching lines...) Expand all
159 env_test.Append(LIBS=['base', 'dl', 'rt', 'nss3']) 159 env_test.Append(LIBS=['base', 'dl', 'rt', 'nss3'])
160 160
161 env_test.ParseConfig('%s --cflags --libs gobject-2.0 dbus-glib-1 dbus-1 nss' % ( 161 env_test.ParseConfig('%s --cflags --libs gobject-2.0 dbus-glib-1 dbus-1 nss' % (
162 env_test['ENV']['PKG_CONFIG'])) 162 env_test['ENV']['PKG_CONFIG']))
163 env_test.Append(CCFLAGS=['-DOS_CHROMEOS']) 163 env_test.Append(CCFLAGS=['-DOS_CHROMEOS'])
164 164
165 env_gtest = env_test.Clone() 165 env_gtest = env_test.Clone()
166 env_gtest.Append(LIBS=['gtest']) 166 env_gtest.Append(LIBS=['gtest'])
167 167
168 env_gtest_main = env_test.Clone() 168 env_gtest_main = env_test.Clone()
169 env_gtest_main.Append(LIBS=['gtest', 'gtest_main', 'chromeos']) 169 env_gtest_main.Append(LIBS=['gtest', 'gtest_main', 'chromeos', 'base'])
170 env_gtest_main.ParseConfig('%s --cflags --libs libpcrecpp x11' % ( 170 env_gtest_main.ParseConfig('%s --cflags --libs libpcrecpp x11' % (
171 env_test['ENV']['PKG_CONFIG'])) 171 env_test['ENV']['PKG_CONFIG']))
172 172
173 env_network_monitor = env_test.Clone() 173 env_network_monitor = env_test.Clone()
174 env_network_monitor.Append(LIBS=['dbus-glib-1']) 174 env_network_monitor.Append(LIBS=['dbus-glib-1'])
175 175
176 env_libcros_service_test = env.Clone() 176 env_libcros_service_test = env.Clone()
177 177
178 Load = base_env.Object('load.cc') 178 Load = base_env.Object('load.cc')
179 179
(...skipping 29 matching lines...) Expand all
209 env_libcros_service_test.Program( 209 env_libcros_service_test.Program(
210 'libcros_service_tester', 210 'libcros_service_tester',
211 ['libcros_service_tester.cc', 211 ['libcros_service_tester.cc',
212 'marshal.glibmarshal.c']), 212 'marshal.glibmarshal.c']),
213 ] 213 ]
214 libcros_service_test_alias = \ 214 libcros_service_test_alias = \
215 Alias('libcros_service_test', libcros_service_tests) 215 Alias('libcros_service_test', libcros_service_tests)
216 AlwaysBuild(libcros_service_test_alias) 216 AlwaysBuild(libcros_service_test_alias)
217 217
218 Alias('crosapi', base_env.StaticLibrary('crosapi', Load), CCFLAGS='-ggdb') 218 Alias('crosapi', base_env.StaticLibrary('crosapi', Load), CCFLAGS='-ggdb')
OLDNEW
« no previous file with comments | « no previous file | chromeos_keyboard.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698