Merge branch 'master' into release-0_12_master_merge

1 files changed, 33 insertions, 27 deletions

diff --git a/build.yaml b/build.yaml
index d93087932f..48403829c5 100644
--- a/build.yaml
+++ b/build.yaml
@@ -641,9 +641,9 @@ libs:
   - test/cpp/util/string_ref_helper.h
   - test/cpp/util/subprocess.h
   src:
-  - test/cpp/util/messages.proto
-  - test/cpp/util/echo.proto
-  - test/cpp/util/echo_duplicate.proto
+  - src/proto/grpc/testing/echo_messages.proto
+  - src/proto/grpc/testing/echo.proto
+  - src/proto/grpc/testing/duplicate/echo_duplicate.proto
   - test/cpp/util/cli_call.cc
   - test/cpp/util/create_test_channel.cc
   - test/cpp/util/string_ref_helper.cc
@@ -699,7 +699,7 @@ libs:
   headers:
   - test/cpp/interop/client_helper.h
   src:
-  - test/proto/messages.proto
+  - src/proto/grpc/testing/messages.proto
   - test/cpp/interop/client_helper.cc
   deps:
   - grpc++_test_util
@@ -713,9 +713,9 @@ libs:
   headers:
   - test/cpp/interop/interop_client.h
   src:
-  - test/proto/empty.proto
-  - test/proto/messages.proto
-  - test/proto/test.proto
+  - src/proto/grpc/testing/empty.proto
+  - src/proto/grpc/testing/messages.proto
+  - src/proto/grpc/testing/test.proto
   - test/cpp/interop/client.cc
   - test/cpp/interop/interop_client.cc
   deps:
@@ -743,9 +743,9 @@ libs:
   build: private
   language: c++
   src:
-  - test/proto/empty.proto
-  - test/proto/messages.proto
-  - test/proto/test.proto
+  - src/proto/grpc/testing/empty.proto
+  - src/proto/grpc/testing/messages.proto
+  - src/proto/grpc/testing/test.proto
   - test/cpp/interop/server.cc
   deps:
   - interop_server_helper
@@ -772,12 +772,12 @@ libs:
   - test/cpp/qps/timer.h
   - test/cpp/util/benchmark_config.h
   src:
-  - test/proto/messages.proto
-  - test/proto/benchmarks/control.proto
-  - test/proto/benchmarks/payloads.proto
-  - test/proto/benchmarks/services.proto
-  - test/proto/benchmarks/stats.proto
-  - test/cpp/qps/perf_db.proto
+  - src/proto/grpc/testing/messages.proto
+  - src/proto/grpc/testing/control.proto
+  - src/proto/grpc/testing/payloads.proto
+  - src/proto/grpc/testing/services.proto
+  - src/proto/grpc/testing/stats.proto
+  - src/proto/grpc/testing/perf_db.proto
   - test/cpp/qps/client_async.cc
   - test/cpp/qps/client_sync.cc
   - test/cpp/qps/driver.cc
@@ -2086,7 +2086,7 @@ targets:
   headers:
   - test/cpp/util/metrics_server.h
   src:
-  - test/proto/metrics.proto
+  - src/proto/grpc/testing/metrics.proto
   - test/cpp/interop/metrics_client.cc
   deps:
   - grpc++
@@ -2198,9 +2198,9 @@ targets:
   run: false
   language: c++
   src:
-  - test/proto/empty.proto
-  - test/proto/messages.proto
-  - test/proto/test.proto
+  - src/proto/grpc/testing/empty.proto
+  - src/proto/grpc/testing/messages.proto
+  - src/proto/grpc/testing/test.proto
   - test/cpp/interop/reconnect_interop_client.cc
   deps:
   - grpc++_test_util
@@ -2215,9 +2215,9 @@ targets:
   run: false
   language: c++
   src:
-  - test/proto/empty.proto
-  - test/proto/messages.proto
-  - test/proto/test.proto
+  - src/proto/grpc/testing/empty.proto
+  - src/proto/grpc/testing/messages.proto
+  - src/proto/grpc/testing/test.proto
   - test/cpp/interop/reconnect_interop_server.cc
   deps:
   - reconnect_server
@@ -2336,10 +2336,10 @@ targets:
   - test/cpp/interop/stress_interop_client.h
   - test/cpp/util/metrics_server.h
   src:
-  - test/proto/empty.proto
-  - test/proto/messages.proto
-  - test/proto/metrics.proto
-  - test/proto/test.proto
+  - src/proto/grpc/testing/empty.proto
+  - src/proto/grpc/testing/messages.proto
+  - src/proto/grpc/testing/metrics.proto
+  - src/proto/grpc/testing/test.proto
   - test/cpp/interop/interop_client.cc
   - test/cpp/interop/stress_interop_client.cc
   - test/cpp/interop/stress_test.cc
@@ -2403,6 +2403,7 @@ targets:
   run: false
   language: c++
   src:
+  - src/proto/grpc/testing/echo.proto
   - test/cpp/end2end/zookeeper_test.cc
   deps:
   - grpc++_test_util
@@ -2475,3 +2476,8 @@ node_modules:
   - src/node/ext/server.cc
   - src/node/ext/server_credentials.cc
   - src/node/ext/timeval.cc
+python_dependencies:
+  deps:
+  - grpc
+  - gpr
+  - boringssl