Skip to content

Commit b17a40c

Browse files
karthikraviskarthikravis
committed
Merge branch 'master' into move-opencensus-to-grpc
2 parents 3e631d0 + c134909 commit b17a40c

34 files changed

+1464
-599
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name: Report a bug
33
about: Create a report to help us improve
44
labels: kind/bug, priority/P2
5-
assignees: veblush
5+
assignees: karthikravis
66

77
---
88

‎.github/ISSUE_TEMPLATE/cleanup_request.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name: Request a cleanup
33
about: Suggest a cleanup in our repository
44
labels: kind/internal cleanup, priority/P2
5-
assignees: veblush
5+
assignees: karthikravis
66

77
---
88

‎.github/ISSUE_TEMPLATE/feature_request.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name: Request a feature
33
about: Suggest an idea for this project
44
labels: kind/enhancement, priority/P2
5-
assignees: veblush
5+
assignees: karthikravis
66

77
---
88

‎.github/pull_request_template.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ If you know who should review your pull request, please remove the mentioning be
88
99
-->
1010

11-
@veblush
11+
@karthikravis

‎CMakeLists.txt‎

Lines changed: 114 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,14 @@ if(WIN32)
152152
set(_gRPC_PLATFORM_WINDOWS ON)
153153
endif()
154154

155+
# Use C99 standard
156+
set(CMAKE_C_STANDARD 99)
157+
158+
# Add c++11 flags
159+
set(CMAKE_CXX_STANDARD 11)
160+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
161+
set(CMAKE_CXX_EXTENSIONS OFF)
162+
155163
set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
156164
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
157165

@@ -201,11 +209,6 @@ include(cmake/ssl.cmake)
201209
include(cmake/upb.cmake)
202210
include(cmake/zlib.cmake)
203211

204-
if(NOT MSVC)
205-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
206-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
207-
endif()
208-
209212
if(_gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_IOS)
210213
set(_gRPC_ALLTARGETS_LIBRARIES ${CMAKE_DL_LIBS} m pthread)
211214
elseif(_gRPC_PLATFORM_ANDROID)
@@ -822,6 +825,8 @@ if(gRPC_BUILD_TESTS)
822825
if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
823826
add_dependencies(buildtests_cxx xds_end2end_test)
824827
endif()
828+
add_dependencies(buildtests_cxx xds_interop_client)
829+
add_dependencies(buildtests_cxx xds_interop_server)
825830
add_dependencies(buildtests_cxx alts_credentials_fuzzer_one_entry)
826831
add_dependencies(buildtests_cxx client_fuzzer_one_entry)
827832
add_dependencies(buildtests_cxx hpack_parser_fuzzer_test_one_entry)
@@ -14509,6 +14514,110 @@ endif()
1450914514
endif()
1451014515
if(gRPC_BUILD_TESTS)
1451114516

14517+
add_executable(xds_interop_client
14518+
${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/empty.pb.cc
14519+
${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/empty.grpc.pb.cc
14520+
${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/empty.pb.h
14521+
${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/empty.grpc.pb.h
14522+
${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/messages.pb.cc
14523+
${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/messages.grpc.pb.cc
14524+
${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/messages.pb.h
14525+
${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/messages.grpc.pb.h
14526+
${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/test.pb.cc
14527+
${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/test.grpc.pb.cc
14528+
${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/test.pb.h
14529+
${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/test.grpc.pb.h
14530+
test/cpp/interop/xds_interop_client.cc
14531+
third_party/googletest/googletest/src/gtest-all.cc
14532+
third_party/googletest/googlemock/src/gmock-all.cc
14533+
)
14534+
14535+
target_include_directories(xds_interop_client
14536+
PRIVATE
14537+
${CMAKE_CURRENT_SOURCE_DIR}
14538+
${CMAKE_CURRENT_SOURCE_DIR}/include
14539+
${_gRPC_ADDRESS_SORTING_INCLUDE_DIR}
14540+
${_gRPC_SSL_INCLUDE_DIR}
14541+
${_gRPC_UPB_GENERATED_DIR}
14542+
${_gRPC_UPB_GRPC_GENERATED_DIR}
14543+
${_gRPC_UPB_INCLUDE_DIR}
14544+
${_gRPC_ZLIB_INCLUDE_DIR}
14545+
third_party/googletest/googletest/include
14546+
third_party/googletest/googletest
14547+
third_party/googletest/googlemock/include
14548+
third_party/googletest/googlemock
14549+
${_gRPC_PROTO_GENS_DIR}
14550+
)
14551+
14552+
target_link_libraries(xds_interop_client
14553+
${_gRPC_PROTOBUF_LIBRARIES}
14554+
${_gRPC_ALLTARGETS_LIBRARIES}
14555+
grpc_test_util
14556+
grpc++
14557+
grpc++_test_config
14558+
grpc
14559+
gpr
14560+
address_sorting
14561+
upb
14562+
${_gRPC_GFLAGS_LIBRARIES}
14563+
)
14564+
14565+
14566+
endif()
14567+
if(gRPC_BUILD_TESTS)
14568+
14569+
add_executable(xds_interop_server
14570+
${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/empty.pb.cc
14571+
${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/empty.grpc.pb.cc
14572+
${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/empty.pb.h
14573+
${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/empty.grpc.pb.h
14574+
${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/messages.pb.cc
14575+
${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/messages.grpc.pb.cc
14576+
${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/messages.pb.h
14577+
${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/messages.grpc.pb.h
14578+
${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/test.pb.cc
14579+
${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/test.grpc.pb.cc
14580+
${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/test.pb.h
14581+
${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/test.grpc.pb.h
14582+
test/cpp/interop/xds_interop_server.cc
14583+
third_party/googletest/googletest/src/gtest-all.cc
14584+
third_party/googletest/googlemock/src/gmock-all.cc
14585+
)
14586+
14587+
target_include_directories(xds_interop_server
14588+
PRIVATE
14589+
${CMAKE_CURRENT_SOURCE_DIR}
14590+
${CMAKE_CURRENT_SOURCE_DIR}/include
14591+
${_gRPC_ADDRESS_SORTING_INCLUDE_DIR}
14592+
${_gRPC_SSL_INCLUDE_DIR}
14593+
${_gRPC_UPB_GENERATED_DIR}
14594+
${_gRPC_UPB_GRPC_GENERATED_DIR}
14595+
${_gRPC_UPB_INCLUDE_DIR}
14596+
${_gRPC_ZLIB_INCLUDE_DIR}
14597+
third_party/googletest/googletest/include
14598+
third_party/googletest/googletest
14599+
third_party/googletest/googlemock/include
14600+
third_party/googletest/googlemock
14601+
${_gRPC_PROTO_GENS_DIR}
14602+
)
14603+
14604+
target_link_libraries(xds_interop_server
14605+
${_gRPC_PROTOBUF_LIBRARIES}
14606+
${_gRPC_ALLTARGETS_LIBRARIES}
14607+
grpc_test_util
14608+
grpc++
14609+
grpc++_test_config
14610+
grpc
14611+
gpr
14612+
address_sorting
14613+
upb
14614+
${_gRPC_GFLAGS_LIBRARIES}
14615+
)
14616+
14617+
14618+
endif()
14619+
if(gRPC_BUILD_TESTS)
14620+
1451214621
add_executable(alts_credentials_fuzzer_one_entry
1451314622
test/core/security/alts_credentials_fuzzer.cc
1451414623
test/core/util/one_corpus_entry_fuzzer.cc

‎Makefile‎

Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1307,6 +1307,8 @@ work_serializer_test: $(BINDIR)/$(CONFIG)/work_serializer_test
13071307
writes_per_rpc_test: $(BINDIR)/$(CONFIG)/writes_per_rpc_test
13081308
xds_bootstrap_test: $(BINDIR)/$(CONFIG)/xds_bootstrap_test
13091309
xds_end2end_test: $(BINDIR)/$(CONFIG)/xds_end2end_test
1310+
xds_interop_client: $(BINDIR)/$(CONFIG)/xds_interop_client
1311+
xds_interop_server: $(BINDIR)/$(CONFIG)/xds_interop_server
13101312
boringssl_ssl_test: $(BINDIR)/$(CONFIG)/boringssl_ssl_test
13111313
boringssl_crypto_test: $(BINDIR)/$(CONFIG)/boringssl_crypto_test
13121314
alts_credentials_fuzzer_one_entry: $(BINDIR)/$(CONFIG)/alts_credentials_fuzzer_one_entry
@@ -1666,6 +1668,8 @@ buildtests_cxx: privatelibs_cxx \
16661668
$(BINDIR)/$(CONFIG)/writes_per_rpc_test \
16671669
$(BINDIR)/$(CONFIG)/xds_bootstrap_test \
16681670
$(BINDIR)/$(CONFIG)/xds_end2end_test \
1671+
$(BINDIR)/$(CONFIG)/xds_interop_client \
1672+
$(BINDIR)/$(CONFIG)/xds_interop_server \
16691673
$(BINDIR)/$(CONFIG)/boringssl_ssl_test \
16701674
$(BINDIR)/$(CONFIG)/boringssl_crypto_test \
16711675
$(BINDIR)/$(CONFIG)/alts_credentials_fuzzer_one_entry \
@@ -1822,6 +1826,8 @@ buildtests_cxx: privatelibs_cxx \
18221826
$(BINDIR)/$(CONFIG)/writes_per_rpc_test \
18231827
$(BINDIR)/$(CONFIG)/xds_bootstrap_test \
18241828
$(BINDIR)/$(CONFIG)/xds_end2end_test \
1829+
$(BINDIR)/$(CONFIG)/xds_interop_client \
1830+
$(BINDIR)/$(CONFIG)/xds_interop_server \
18251831
$(BINDIR)/$(CONFIG)/alts_credentials_fuzzer_one_entry \
18261832
$(BINDIR)/$(CONFIG)/client_fuzzer_one_entry \
18271833
$(BINDIR)/$(CONFIG)/hpack_parser_fuzzer_test_one_entry \
@@ -19152,6 +19158,112 @@ $(OBJDIR)/$(CONFIG)/test/cpp/end2end/test_service_impl.o: $(GENDIR)/src/proto/gr
1915219158
$(OBJDIR)/$(CONFIG)/test/cpp/end2end/xds_end2end_test.o: $(GENDIR)/src/proto/grpc/testing/duplicate/echo_duplicate.pb.cc $(GENDIR)/src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/echo.pb.cc $(GENDIR)/src/proto/grpc/testing/echo.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/echo_messages.pb.cc $(GENDIR)/src/proto/grpc/testing/echo_messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/simple_messages.pb.cc $(GENDIR)/src/proto/grpc/testing/simple_messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/xds/ads_for_test.pb.cc $(GENDIR)/src/proto/grpc/testing/xds/ads_for_test.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/xds/cds_for_test.pb.cc $(GENDIR)/src/proto/grpc/testing/xds/cds_for_test.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/xds/eds_for_test.pb.cc $(GENDIR)/src/proto/grpc/testing/xds/eds_for_test.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/xds/lds_rds_for_test.pb.cc $(GENDIR)/src/proto/grpc/testing/xds/lds_rds_for_test.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/xds/lrs_for_test.pb.cc $(GENDIR)/src/proto/grpc/testing/xds/lrs_for_test.grpc.pb.cc
1915319159

1915419160

19161+
XDS_INTEROP_CLIENT_SRC = \
19162+
$(GENDIR)/src/proto/grpc/testing/empty.pb.cc $(GENDIR)/src/proto/grpc/testing/empty.grpc.pb.cc \
19163+
$(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc \
19164+
$(GENDIR)/src/proto/grpc/testing/test.pb.cc $(GENDIR)/src/proto/grpc/testing/test.grpc.pb.cc \
19165+
test/cpp/interop/xds_interop_client.cc \
19166+
19167+
XDS_INTEROP_CLIENT_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(XDS_INTEROP_CLIENT_SRC))))
19168+
ifeq ($(NO_SECURE),true)
19169+
19170+
# You can't build secure targets if you don't have OpenSSL.
19171+
19172+
$(BINDIR)/$(CONFIG)/xds_interop_client: openssl_dep_error
19173+
19174+
else
19175+
19176+
19177+
19178+
19179+
ifeq ($(NO_PROTOBUF),true)
19180+
19181+
# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.5.0+.
19182+
19183+
$(BINDIR)/$(CONFIG)/xds_interop_client: protobuf_dep_error
19184+
19185+
else
19186+
19187+
$(BINDIR)/$(CONFIG)/xds_interop_client: $(PROTOBUF_DEP) $(XDS_INTEROP_CLIENT_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a
19188+
$(E) "[LD] Linking $@"
19189+
$(Q) mkdir -p `dirname $@`
19190+
$(Q) $(LDXX) $(LDFLAGS) $(XDS_INTEROP_CLIENT_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/xds_interop_client
19191+
19192+
endif
19193+
19194+
endif
19195+
19196+
$(OBJDIR)/$(CONFIG)/src/proto/grpc/testing/empty.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a
19197+
19198+
$(OBJDIR)/$(CONFIG)/src/proto/grpc/testing/messages.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a
19199+
19200+
$(OBJDIR)/$(CONFIG)/src/proto/grpc/testing/test.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a
19201+
19202+
$(OBJDIR)/$(CONFIG)/test/cpp/interop/xds_interop_client.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a
19203+
19204+
deps_xds_interop_client: $(XDS_INTEROP_CLIENT_OBJS:.o=.dep)
19205+
19206+
ifneq ($(NO_SECURE),true)
19207+
ifneq ($(NO_DEPS),true)
19208+
-include $(XDS_INTEROP_CLIENT_OBJS:.o=.dep)
19209+
endif
19210+
endif
19211+
$(OBJDIR)/$(CONFIG)/test/cpp/interop/xds_interop_client.o: $(GENDIR)/src/proto/grpc/testing/empty.pb.cc $(GENDIR)/src/proto/grpc/testing/empty.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/test.pb.cc $(GENDIR)/src/proto/grpc/testing/test.grpc.pb.cc
19212+
19213+
19214+
XDS_INTEROP_SERVER_SRC = \
19215+
$(GENDIR)/src/proto/grpc/testing/empty.pb.cc $(GENDIR)/src/proto/grpc/testing/empty.grpc.pb.cc \
19216+
$(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc \
19217+
$(GENDIR)/src/proto/grpc/testing/test.pb.cc $(GENDIR)/src/proto/grpc/testing/test.grpc.pb.cc \
19218+
test/cpp/interop/xds_interop_server.cc \
19219+
19220+
XDS_INTEROP_SERVER_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(XDS_INTEROP_SERVER_SRC))))
19221+
ifeq ($(NO_SECURE),true)
19222+
19223+
# You can't build secure targets if you don't have OpenSSL.
19224+
19225+
$(BINDIR)/$(CONFIG)/xds_interop_server: openssl_dep_error
19226+
19227+
else
19228+
19229+
19230+
19231+
19232+
ifeq ($(NO_PROTOBUF),true)
19233+
19234+
# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.5.0+.
19235+
19236+
$(BINDIR)/$(CONFIG)/xds_interop_server: protobuf_dep_error
19237+
19238+
else
19239+
19240+
$(BINDIR)/$(CONFIG)/xds_interop_server: $(PROTOBUF_DEP) $(XDS_INTEROP_SERVER_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a
19241+
$(E) "[LD] Linking $@"
19242+
$(Q) mkdir -p `dirname $@`
19243+
$(Q) $(LDXX) $(LDFLAGS) $(XDS_INTEROP_SERVER_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/xds_interop_server
19244+
19245+
endif
19246+
19247+
endif
19248+
19249+
$(OBJDIR)/$(CONFIG)/src/proto/grpc/testing/empty.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a
19250+
19251+
$(OBJDIR)/$(CONFIG)/src/proto/grpc/testing/messages.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a
19252+
19253+
$(OBJDIR)/$(CONFIG)/src/proto/grpc/testing/test.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a
19254+
19255+
$(OBJDIR)/$(CONFIG)/test/cpp/interop/xds_interop_server.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libaddress_sorting.a $(LIBDIR)/$(CONFIG)/libupb.a
19256+
19257+
deps_xds_interop_server: $(XDS_INTEROP_SERVER_OBJS:.o=.dep)
19258+
19259+
ifneq ($(NO_SECURE),true)
19260+
ifneq ($(NO_DEPS),true)
19261+
-include $(XDS_INTEROP_SERVER_OBJS:.o=.dep)
19262+
endif
19263+
endif
19264+
$(OBJDIR)/$(CONFIG)/test/cpp/interop/xds_interop_server.o: $(GENDIR)/src/proto/grpc/testing/empty.pb.cc $(GENDIR)/src/proto/grpc/testing/empty.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/test.pb.cc $(GENDIR)/src/proto/grpc/testing/test.grpc.pb.cc
19265+
19266+
1915519267
BORINGSSL_SSL_TEST_SRC = \
1915619268
third_party/boringssl-with-bazel/src/crypto/test/abi_test.cc \
1915719269
third_party/boringssl-with-bazel/src/crypto/test/gtest_main.cc \

‎build_autogenerated.yaml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7565,4 +7565,40 @@ targets:
75657565
- linux
75667566
- posix
75677567
- mac
7568+
- name: xds_interop_client
7569+
build: test
7570+
run: false
7571+
language: c++
7572+
headers: []
7573+
src:
7574+
- src/proto/grpc/testing/empty.proto
7575+
- src/proto/grpc/testing/messages.proto
7576+
- src/proto/grpc/testing/test.proto
7577+
- test/cpp/interop/xds_interop_client.cc
7578+
deps:
7579+
- grpc_test_util
7580+
- grpc++
7581+
- grpc++_test_config
7582+
- grpc
7583+
- gpr
7584+
- address_sorting
7585+
- upb
7586+
- name: xds_interop_server
7587+
build: test
7588+
run: false
7589+
language: c++
7590+
headers: []
7591+
src:
7592+
- src/proto/grpc/testing/empty.proto
7593+
- src/proto/grpc/testing/messages.proto
7594+
- src/proto/grpc/testing/test.proto
7595+
- test/cpp/interop/xds_interop_server.cc
7596+
deps:
7597+
- grpc_test_util
7598+
- grpc++
7599+
- grpc++_test_config
7600+
- grpc
7601+
- gpr
7602+
- address_sorting
7603+
- upb
75687604
tests: []

0 commit comments

Comments
 (0)