diff options
| author |  Eric Gribkoff <ericgribkoff@google.com> | 2018-04-16 09:26:04 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-04-16 09:26:04 -0700 |
| commit | 67bfead4f06b6cb8670752ebf0ed1b669643eb61 (patch) | |
| tree | 760be9d234185c8230a2e31885e7c2521bd70a2b /tools | |
| parent | 082ddc563ea71a6b7a700070ec60095bfb65d88f (diff) | |
| parent | 6f6b83e6b45714814ce3a079c6949cfaaa6ee393 (diff) | |
Merge pull request #14951 from ericgribkoff/android_interop
Android C++ Interop App
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/distrib/check_copyright.py | 3 | ||||
| -rwxr-xr-x | tools/internal_ci/linux/grpc_android.sh | 27 |
2 files changed, 28 insertions, 2 deletions
diff --git a/tools/distrib/check_copyright.py b/tools/distrib/check_copyright.py index e7893a1fd5..66acc733e5 100755 --- a/tools/distrib/check_copyright.py +++ b/tools/distrib/check_copyright.py @@ -93,8 +93,9 @@ _EXEMPT = frozenset(( # status.proto copied from googleapis 'src/proto/grpc/status/status.proto', - # Gradle wrapper used to build for Android + # Gradle wrappers used to build for Android 'examples/android/helloworld/gradlew.bat', + 'src/android/test/interop/gradlew.bat', )) RE_YEAR = r'Copyright (?P<first_year>[0-9]+\-)?(?P<last_year>[0-9]+) gRPC authors.' diff --git a/tools/internal_ci/linux/grpc_android.sh b/tools/internal_ci/linux/grpc_android.sh index c693b772fd..2220145dac 100755 --- a/tools/internal_ci/linux/grpc_android.sh +++ b/tools/internal_ci/linux/grpc_android.sh @@ -31,7 +31,32 @@ cd third_party/protobuf git fetch git cherry-pick 7daa320065f3bea2b54bf983337d1724f153422d -m 1 -cd ../../examples/android/helloworld + +# Build and run interop instrumentation tests on Firebase Test Lab + +cd "${REPO_ROOT}/src/android/test/interop/" +./gradlew assembleDebug \ + "-Pprotoc=${REPO_ROOT}/third_party/protobuf/src/protoc" \ + "-Pgrpc_cpp_plugin=${REPO_ROOT}/bins/opt/grpc_cpp_plugin" +./gradlew assembleDebugAndroidTest \ + "-Pprotoc=${REPO_ROOT}/third_party/protobuf/src/protoc" \ + "-Pgrpc_cpp_plugin=${REPO_ROOT}/bins/opt/grpc_cpp_plugin" +gcloud firebase test android run \ + --type instrumentation \ + --app app/build/outputs/apk/debug/app-debug.apk \ + --test app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk \ + --device model=Nexus6P,version=27,locale=en,orientation=portrait \ + --device model=Nexus6P,version=26,locale=en,orientation=portrait \ + --device model=Nexus6P,version=25,locale=en,orientation=portrait \ + --device model=Nexus6P,version=24,locale=en,orientation=portrait \ + --device model=Nexus6P,version=23,locale=en,orientation=portrait \ + --device model=Nexus6,version=22,locale=en,orientation=portrait \ + --device model=Nexus6,version=21,locale=en,orientation=portrait + + +# Build hello world example + +cd "${REPO_ROOT}/examples/android/helloworld" ./gradlew build \ "-Pprotoc=${REPO_ROOT}/third_party/protobuf/src/protoc" \ "-Pgrpc_cpp_plugin=${REPO_ROOT}/bins/opt/grpc_cpp_plugin" |