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

Unified Diff: SConstruct

Issue 6602095: libchromeos: revert add process control library, syslog logging capability, and run unit tests (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/common.git@master
Patch Set: Created 9 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chromeos/process.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: SConstruct
diff --git a/SConstruct b/SConstruct
index 57ef87a937d2dba8a6e9847459f2ad8457beda2c..04b3b62ac631a303f6a7d33409b73f440f99f1c2 100644
--- a/SConstruct
+++ b/SConstruct
@@ -8,9 +8,7 @@ import sys
SOURCES=['chromeos/dbus/abstract_dbus_service.cc',
'chromeos/dbus/dbus.cc',
'chromeos/dbus/service_constants.cc',
- 'chromeos/process.cc',
'chromeos/string.cc',
- 'chromeos/syslog_logging.cc',
'chromeos/utility.cc']
env = Environment(
@@ -42,7 +40,7 @@ if ARGUMENTS.get('debug', 0):
env_test = env.Clone()
env_test.Append(
- LIBS = ['gtest', 'base', 'rt'],
+ LIBS = ['gtest', 'chromeos', 'base', 'rt'],
LIBPATH = ['.', '../third_party/chrome'],
)
for key in Split('CC CXX AR RANLIB LD NM CFLAGS CCFLAGS'):
@@ -50,14 +48,12 @@ for key in Split('CC CXX AR RANLIB LD NM CFLAGS CCFLAGS'):
if value:
env_test[key] = Split(value)
-# Use libchromeos instead of passing in LIBS in order to always
-# get the version we just built, not what was previously installed.
-unittest_sources =['chromeos/glib/object_unittest.cc',
- 'chromeos/process_test.cc',
- 'libchromeos.a']
+unittest_sources =['chromeos/glib/object_unittest.cc']
unittest_main = ['testrunner.cc']
unittest_cmd = env_test.Program('unittests',
unittest_sources + unittest_main)
Clean(unittest_cmd, Glob('*.gcda') + Glob('*.gcno') + Glob('*.gcov') +
Split('html app.info'))
+
+
« no previous file with comments | « no previous file | chromeos/process.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698