grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

buildscripts: clean up android related scripts (#6843) 

Fix incorrect android-interop-testing apk path after flatten the project structure.
This commit is contained in:
Chengyuan Zhang 2020-03-19 19:09:54 -07:00 committed by GitHub
parent d537adedb3
commit 95e331a69b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
buildscripts/kokoro/android-interop.sh
View File

@ -21,17 +21,14 @@ echo y | ${ANDROID_HOME}/tools/bin/sdkmanager "build-tools;28.0.3"
# Proto deps # Proto deps
buildscripts/make_dependencies.sh buildscripts/make_dependencies.sh
./gradlew publishToMavenLocal
# Build and run interop instrumentation tests on Firebase Test Lab # Build and run interop instrumentation tests on Firebase Test Lab
cd android-interop-testing cd android-interop-testing
../gradlew assembleDebug ../gradlew assembleDebug
../gradlew assembleDebugAndroidTest ../gradlew assembleDebugAndroidTest
gcloud firebase test android run \ gcloud firebase test android run \
--type instrumentation \ --type instrumentation \
--app app/build/outputs/apk/debug/app-debug.apk \ --app build/outputs/apk/debug/grpc-android-interop-testing-debug.apk \
--test app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk \ --test build/outputs/apk/androidTest/debug/grpc-android-interop-testing-debug-androidTest.apk \
--environment-variables \ --environment-variables \
server_host=grpc-test.sandbox.googleapis.com,server_port=443,test_case=all \ server_host=grpc-test.sandbox.googleapis.com,server_port=443,test_case=all \
--device model=Nexus6P,version=27,locale=en,orientation=portrait \ --device model=Nexus6P,version=27,locale=en,orientation=portrait \

5
buildscripts/kokoro/android.sh
View File

@ -27,8 +27,6 @@ echo y | ${ANDROID_HOME}/tools/bin/sdkmanager "build-tools;28.0.3"
# Proto deps # Proto deps
buildscripts/make_dependencies.sh buildscripts/make_dependencies.sh
./gradlew publishToMavenLocal
# Build grpc-cronet # Build grpc-cronet
pushd cronet pushd cronet
@ -46,6 +44,9 @@ pushd android-interop-testing
../gradlew build ../gradlew build
popd popd
# Examples pull dependencies from maven local
./gradlew publishToMavenLocal
# Build examples # Build examples
cd ./examples/android/clientcache cd ./examples/android/clientcache