diff options
| author |  Eric Gribkoff <ericgribkoff@google.com> | 2018-03-23 17:01:52 -0700 |
|---|---|---|
| committer | Eric Gribkoff <ericgribkoff@google.com> | 2018-03-23 17:04:25 -0700 |
| commit | f54e4a35fad69cbddc5d39e5ab40b98cef194a66 (patch) | |
| tree | 8b91faab72d8e9a3ce2442e4aa4ad4d993f31088 /tools | |
| parent | 51332ab0e5493d3a040208a66c29c92798d4b9e6 (diff) | |
build protoc and grpc_cpp_plugin for android kokoro job
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/internal_ci/linux/grpc_android.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tools/internal_ci/linux/grpc_android.sh b/tools/internal_ci/linux/grpc_android.sh index 1417b9686a..f2b52bb88a 100755 --- a/tools/internal_ci/linux/grpc_android.sh +++ b/tools/internal_ci/linux/grpc_android.sh @@ -20,6 +20,9 @@ cd $(dirname $0)/../../.. git submodule update --init +# Build protoc and grpc_cpp_plugin. Codegen is not cross-compiled to Android +make HAS_SYSTEM_PROTOBUF=false + # TODO(ericgribkoff) Remove when this commit (already in master) is included in # next protobuf release cd third_party/protobuf @@ -27,4 +30,6 @@ git fetch git cherry-pick 7daa320065f3bea2b54bf983337d1724f153422d -m 1 cd ../../examples/android/helloworld -./gradlew build +./gradlew build \ + -Dprotoc=../../../third_party/protobuf/src/protoc \ + -Dgrpc_cpp_plugin=../../../bins/opt/grpc_cpp_plugin |