Skip to content

Commit

Permalink
buildscripts: clean up android related scripts (#6843)
Browse files Browse the repository at this point in the history
Fix incorrect android-interop-testing apk path after flatten the project structure.
  • Loading branch information
voidzcy committed Mar 20, 2020
1 parent d537ade commit 95e331a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
7 changes: 2 additions & 5 deletions buildscripts/kokoro/android-interop.sh
Expand Up @@ -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 \
Expand Down
5 changes: 3 additions & 2 deletions buildscripts/kokoro/android.sh
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 95e331a

Please sign in to comment.