diff options
| author |  ncteisen <ncteisen@gmail.com> | 2018-03-02 22:09:52 -0800 |
|---|---|---|
| committer | ncteisen <ncteisen@gmail.com> | 2018-03-02 22:09:52 -0800 |
| commit | 94dad67f4386ca1d46d96fd255cf4a9df5c087b2 (patch) | |
| tree | 43e29b584e7d8c062d91eee5d0fc50639c1643e4 /Makefile | |
| parent | c1284576f81efc4b2d9c33c4337d8c9fbafc29de (diff) | |
| parent | 6eae794c9f8f305a51274a79400124093ddc9354 (diff) | |
Merge branch 'master' of https://github.com/grpc/grpc into channel-tracing
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -2924,9 +2924,6 @@ LIBGPR_SRC = \ src/core/lib/gpr/sync.cc \ src/core/lib/gpr/sync_posix.cc \ src/core/lib/gpr/sync_windows.cc \ - src/core/lib/gpr/thd.cc \ - src/core/lib/gpr/thd_posix.cc \ - src/core/lib/gpr/thd_windows.cc \ src/core/lib/gpr/time.cc \ src/core/lib/gpr/time_posix.cc \ src/core/lib/gpr/time_precise.cc \ @@ -2936,6 +2933,8 @@ LIBGPR_SRC = \ src/core/lib/gpr/tmpfile_posix.cc \ src/core/lib/gpr/tmpfile_windows.cc \ src/core/lib/gpr/wrap_memcpy.cc \ + src/core/lib/gprpp/thd_posix.cc \ + src/core/lib/gprpp/thd_windows.cc \ src/core/lib/profiling/basic_timers.cc \ src/core/lib/profiling/stap_timers.cc \ @@ -11096,7 +11095,7 @@ endif GPR_THD_TEST_SRC = \ - test/core/gpr/thd_test.cc \ + test/core/gprpp/thd_test.cc \ GPR_THD_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GPR_THD_TEST_SRC)))) ifeq ($(NO_SECURE),true) @@ -11116,7 +11115,7 @@ $(BINDIR)/$(CONFIG)/gpr_thd_test: $(GPR_THD_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgp endif -$(OBJDIR)/$(CONFIG)/test/core/gpr/thd_test.o: $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a +$(OBJDIR)/$(CONFIG)/test/core/gprpp/thd_test.o: $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a deps_gpr_thd_test: $(GPR_THD_TEST_OBJS:.o=.dep) |