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