build protoc and grpc_cpp_plugin for android kokoro job

2 files changed, 15 insertions, 7 deletions

diff --git a/examples/android/helloworld/app/build.gradle b/examples/android/helloworld/app/build.gradle
index c6ab7308ae..1d09fdc180 100644
--- a/examples/android/helloworld/app/build.gradle
+++ b/examples/android/helloworld/app/build.gradle
@@ -11,6 +11,13 @@ android {
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {
+                // The paths to the protoc and grpc_cpp_plugin binaries on the host system (codegen
+                // is not cross-compiled to Android)
+                def protoc = project.hasProperty('protoc') ?
+                        project.property('protoc') : '/usr/local/bin/protoc'
+                def grpc_cpp_plugin = project.hasProperty('grpc_cpp_plugin') ?
+                        project.property('grpc_cpp_plugin') : '/usr/local/bin/grpc_cpp_plugin'
+
                 cppFlags "-std=c++14 -frtti -fexceptions"
                 arguments '-DANDROID_STL=c++_static'
                 arguments '-DRUN_HAVE_POSIX_REGEX=0'
@@ -18,12 +25,8 @@ android {
                 arguments '-DRUN_HAVE_STEADY_CLOCK=0'
                 arguments '-Dprotobuf_BUILD_PROTOC_BINARIES=off'
                 arguments '-DgRPC_BUILD_CODEGEN=off'
-                // Set this to the path to the protoc binary on the host system (codegen is not
-                // cross-compiled to Android)
-                arguments '-Dhelloworld_PROTOBUF_PROTOC_EXECUTABLE=/usr/local/bin/protoc'
-                // Set this to the path to the gRPC C++ protoc plugin binary on the host system
-                // (codegen is not cross-compiled to Android)
-                arguments '-Dhelloworld_GRPC_CPP_PLUGIN_EXECUTABLE=/usr/local/bin/grpc_cpp_plugin'
+                arguments '-Dhelloworld_PROTOBUF_PROTOC_EXECUTABLE=' + protoc
+                arguments '-Dhelloworld_GRPC_CPP_PLUGIN_EXECUTABLE=' + grpc_cpp_plugin
             }
         }
         ndk.abiFilters 'x86'
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