diff options
| author |  Eric Gribkoff <ericgribkoff@google.com> | 2018-03-26 12:39:00 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-03-26 12:39:00 -0700 |
| commit | 4e7e4925501d6fa28f2295f650699d0d1e51aa2d (patch) | |
| tree | 257ac0ba2a9ec5632f2badc62414d4e7e93e6772 | |
| parent | bc7e096dd38cd8fca1504986abd2025019004563 (diff) | |
| parent | 18e954d3e1ed6145b57d446b009a4aca7dd8c7d7 (diff) | |
Correctly set gradle project properties
| -rwxr-xr-x | tools/internal_ci/linux/grpc_android.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/internal_ci/linux/grpc_android.sh b/tools/internal_ci/linux/grpc_android.sh index f2b52bb88a..c693b772fd 100755 --- a/tools/internal_ci/linux/grpc_android.sh +++ b/tools/internal_ci/linux/grpc_android.sh @@ -18,6 +18,8 @@ set -ex # change to grpc repo root cd $(dirname $0)/../../.. +REPO_ROOT="$(pwd)" + git submodule update --init # Build protoc and grpc_cpp_plugin. Codegen is not cross-compiled to Android @@ -31,5 +33,5 @@ git cherry-pick 7daa320065f3bea2b54bf983337d1724f153422d -m 1 cd ../../examples/android/helloworld ./gradlew build \ - -Dprotoc=../../../third_party/protobuf/src/protoc \ - -Dgrpc_cpp_plugin=../../../bins/opt/grpc_cpp_plugin + "-Pprotoc=${REPO_ROOT}/third_party/protobuf/src/protoc" \ + "-Pgrpc_cpp_plugin=${REPO_ROOT}/bins/opt/grpc_cpp_plugin" |