Revert "Revert "Make the metrics library respect the policy settings instead of the consent file.""
This reverts commit aa91d046ac27a9bdc96e6cd9438741d98f1cef66
Change-Id: I1c84fb86d6eb56a5a8e88136c98104394be697b2
Reviewed-on: http://gerrit.chromium.org/gerrit/4614
Reviewed-by: Darin Petkov <petkov@chromium.org>
Reviewed-by: Ken Mixter <kmixter@chromium.org>
Tested-by: Ken Mixter <kmixter@chromium.org>
diff --git a/metrics/Makefile b/metrics/Makefile
index 032ea73..2920547 100644
--- a/metrics/Makefile
+++ b/metrics/Makefile
@@ -39,16 +39,17 @@
TESTCOUNTER_LIBS = -lgmock -lgtest -lbase -lrt -lpthread -lglib-2.0
DAEMON_LDFLAGS = $(LDFLAGS) $(LDCONFIG) -lrt -lbase -lpthread -lgflags \
- -lglib-2.0 -lrootdev
+ -lglib-2.0 -lrootdev -lpolicy
TESTDAEMON_LIBS = -lgmock -lgtest
-TESTLIB_LIBS = -lgtest -lbase -lrt -lpthread -lglib-2.0
+TESTLIB_LIBS = -lgtest -lgmock -lbase -lrt -lpthread -lglib-2.0
+POLICY_LIBS = -lpolicy
all: $(LIB) $(SHAREDLIB) $(CLIENT) $(DAEMON)
tests: $(COUNTER_TEST) $(DAEMON_TEST) $(LIB_TEST)
$(CLIENT): $(CLIENT_OBJS) $(SHAREDLIB)
- $(CXX) $(LDFLAGS) $^ -o $@
+ $(CXX) $(LDFLAGS) $(POLICY_LIBS) -lrt $^ -o $@
$(COUNTER_TEST): $(TESTCOUNTER_OBJS)
$(CXX) -o $@ $^ $(TESTCOUNTER_LIBS)
@@ -63,10 +64,10 @@
$(AR) rcs $@ $^
$(SHAREDLIB): $(LIB_OBJS)
- $(CXX) $(LDFLAGS) -shared $^ -o $@
+ $(CXX) $(LDFLAGS) $(POLICY_LIBS) -shared $^ -o $@
$(LIB_TEST): $(TESTLIB_OBJS) $(SHAREDLIB)
- $(CXX) -o $@ $^ $(LDFLAGS) $(TESTLIB_LIBS)
+ $(CXX) -o $@ $^ $(LDFLAGS) $(POLICY_LIBS) $(TESTLIB_LIBS)
%.o: %.cc
$(CXX) $(CXXFLAGS) -c $< -o $@