Chromium Code Reviews Chromium Code Reviews
Issue 6730021:
crash-reporter: Create a list_proxies command (Closed)
Base URL: ssh://git@gitrw.chromium.org:9222/crash-reporter.git@master| OLD | NEW |
|---|---|
| 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 CRASH_REPORTER = crash_reporter | 5 CRASH_REPORTER = crash_reporter |
| 6 REPORTER_BINS = $(CRASH_REPORTER) | 6 GET_PROXIES = get_proxies |
|
kmixter1
2011/03/24 17:24:34
Would add _BIN
Michael Krebs
2011/04/05 01:12:03
Done.
| |
| 7 REPORTER_BINS = $(CRASH_REPORTER) $(GET_PROXIES) | |
| 7 CRASH_OBJS = \ | 8 CRASH_OBJS = \ |
| 8 crash_collector.o \ | 9 crash_collector.o \ |
| 9 kernel_collector.o \ | 10 kernel_collector.o \ |
| 10 unclean_shutdown_collector.o \ | 11 unclean_shutdown_collector.o \ |
| 11 user_collector.o | 12 user_collector.o |
| 13 GET_PROXIES_OBJS = \ | |
| 14 get_proxies.o | |
| 12 TEST_OBJS = $(CRASH_OBJS) | 15 TEST_OBJS = $(CRASH_OBJS) |
| 13 TEST_BINS = \ | 16 TEST_BINS = \ |
| 14 crash_collector_test \ | 17 crash_collector_test \ |
| 15 kernel_collector_test \ | 18 kernel_collector_test \ |
| 16 unclean_shutdown_collector_test \ | 19 unclean_shutdown_collector_test \ |
| 17 » user_collector_test | 20 » user_collector_test \ |
| 21 » get_proxies_test | |
| 18 | 22 |
| 19 LDCONFIG = $(shell $(PKG_CONFIG) --libs libpcrecpp) | 23 LDCONFIG = $(shell $(PKG_CONFIG) --libs libpcrecpp) |
| 20 | 24 |
| 21 # -lglib-2.0 is needed by libbase.a now. | 25 # -lglib-2.0 is needed by libbase.a now. |
| 22 COMMON_LIBS = -lchromeos -lbase -lpthread -lglib-2.0 -lgflags -lrt $(LDCONFIG) | 26 COMMON_LIBS = -lchromeos -lbase -lgflags $(LDCONFIG) \ |
| 27 » $(shell $(PKG_CONFIG) --libs gobject-2.0 dbus-1 dbus-glib-1) | |
|
kmixter1
2011/03/24 17:24:34
prefer to not link gobject/dbus into crash reporte
Michael Krebs
2011/04/05 01:12:03
Done. I think this had been needed for update_eng
| |
| 23 REPORTER_LIBS = $(COMMON_LIBS) -lmetrics | 28 REPORTER_LIBS = $(COMMON_LIBS) -lmetrics |
| 29 # MTEMP: GET_PROXIES_LIBS = $(COMMON_LIBS) -lprotobuf | |
|
kmixter1
2011/03/24 17:24:34
remove?
Michael Krebs
2011/04/05 01:12:03
Done.
| |
| 30 GET_PROXIES_LIBS = $(COMMON_LIBS) | |
| 24 | 31 |
| 25 TEST_LIBS = $(COMMON_LIBS) -lgtest -lgmock | 32 TEST_LIBS = $(COMMON_LIBS) -lgtest -lgmock |
| 26 INCLUDE_DIRS = -I.. -I$(SYSROOT)/usr/include/google-breakpad | 33 INCLUDE_DIRS = -I.. -I$(SYSROOT)/usr/include/google-breakpad \ |
| 34 » $(shell $(PKG_CONFIG) --cflags gobject-2.0 dbus-1 dbus-glib-1) | |
| 27 | 35 |
| 28 CXXFLAGS += -Wall -Werror | 36 CXXFLAGS += -Wall -Werror |
| 29 | 37 |
| 30 all: $(REPORTER_BINS) | 38 all: $(REPORTER_BINS) |
| 31 | 39 |
| 32 $(CRASH_REPORTER): crash_reporter.o $(CRASH_OBJS) | 40 $(CRASH_REPORTER): crash_reporter.o $(CRASH_OBJS) |
| 33 $(CXX) $(CXXFLAGS) $^ $(REPORTER_LIBS) -o $@ | 41 $(CXX) $(CXXFLAGS) $^ $(REPORTER_LIBS) -o $@ |
| 34 | 42 |
| 43 $(GET_PROXIES): $(GET_PROXIES_OBJS) | |
| 44 $(CXX) $(CXXFLAGS) $^ $(GET_PROXIES_LIBS) -o $@ | |
| 45 | |
| 35 tests: $(TEST_BINS) | 46 tests: $(TEST_BINS) |
| 36 | 47 |
| 37 %_test: %_test.o $(TEST_OBJS) | 48 %_test: %_test.o $(TEST_OBJS) |
| 38 $(CXX) $(CXXFLAGS) $(LIB_DIRS) $^ $(TEST_LIBS) -o $@ | 49 $(CXX) $(CXXFLAGS) $(LIB_DIRS) $^ $(TEST_LIBS) -o $@ |
| 39 | 50 |
| 40 .cc.o: | 51 .cc.o: |
| 41 $(CXX) $(CXXFLAGS) $(INCLUDE_DIRS) -c $< -o $@ | 52 $(CXX) $(CXXFLAGS) $(INCLUDE_DIRS) -c $< -o $@ |
| 42 | 53 |
| 43 clean: | 54 clean: |
| 44 » rm -rf *.o $(CRASH_BIN) $(TEST_BINS) | 55 » rm -rf *.o $(CRASH_BIN) $(GET_PROXIES) $(TEST_BINS) |
| OLD | NEW |
