From 95e331a69ba2c70c231d1b75a4e51a6098ae3673 Mon Sep 17 00:00:00 2001 From: Chengyuan Zhang Date: Thu, 19 Mar 2020 19:09:54 -0700 Subject: [PATCH] buildscripts: clean up android related scripts (#6843) Fix incorrect android-interop-testing apk path after flatten the project structure. --- buildscripts/kokoro/android-interop.sh | 7 ++----- buildscripts/kokoro/android.sh | 5 +++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/buildscripts/kokoro/android-interop.sh b/buildscripts/kokoro/android-interop.sh index 2c5d6c84d5..5d9774bb12 100755 --- a/buildscripts/kokoro/android-interop.sh +++ b/buildscripts/kokoro/android-interop.sh @@ -21,17 +21,14 @@ echo y | ${ANDROID_HOME}/tools/bin/sdkmanager "build-tools;28.0.3" # Proto deps buildscripts/make_dependencies.sh -./gradlew publishToMavenLocal - - # Build and run interop instrumentation tests on Firebase Test Lab cd android-interop-testing ../gradlew assembleDebug ../gradlew assembleDebugAndroidTest 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 \ + --app build/outputs/apk/debug/grpc-android-interop-testing-debug.apk \ + --test build/outputs/apk/androidTest/debug/grpc-android-interop-testing-debug-androidTest.apk \ --environment-variables \ server_host=grpc-test.sandbox.googleapis.com,server_port=443,test_case=all \ --device model=Nexus6P,version=27,locale=en,orientation=portrait \ diff --git a/buildscripts/kokoro/android.sh b/buildscripts/kokoro/android.sh index 909c446b59..9751c9aa43 100755 --- a/buildscripts/kokoro/android.sh +++ b/buildscripts/kokoro/android.sh @@ -27,8 +27,6 @@ echo y | ${ANDROID_HOME}/tools/bin/sdkmanager "build-tools;28.0.3" # Proto deps buildscripts/make_dependencies.sh -./gradlew publishToMavenLocal - # Build grpc-cronet pushd cronet @@ -46,6 +44,9 @@ pushd android-interop-testing ../gradlew build popd +# Examples pull dependencies from maven local +./gradlew publishToMavenLocal + # Build examples cd ./examples/android/clientcache