Skip to content

Commit 95e331a

Browse files
authored
buildscripts: clean up android related scripts (#6843)
Fix incorrect android-interop-testing apk path after flatten the project structure.
1 parent d537ade commit 95e331a

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

buildscripts/kokoro/android-interop.sh

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,14 @@ echo y | ${ANDROID_HOME}/tools/bin/sdkmanager "build-tools;28.0.3"
2121
# Proto deps
2222
buildscripts/make_dependencies.sh
2323

24-
./gradlew publishToMavenLocal
25-
26-
2724
# Build and run interop instrumentation tests on Firebase Test Lab
2825
cd android-interop-testing
2926
../gradlew assembleDebug
3027
../gradlew assembleDebugAndroidTest
3128
gcloud firebase test android run \
3229
--type instrumentation \
33-
--app app/build/outputs/apk/debug/app-debug.apk \
34-
--test app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk \
30+
--app build/outputs/apk/debug/grpc-android-interop-testing-debug.apk \
31+
--test build/outputs/apk/androidTest/debug/grpc-android-interop-testing-debug-androidTest.apk \
3532
--environment-variables \
3633
server_host=grpc-test.sandbox.googleapis.com,server_port=443,test_case=all \
3734
--device model=Nexus6P,version=27,locale=en,orientation=portrait \

buildscripts/kokoro/android.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ echo y | ${ANDROID_HOME}/tools/bin/sdkmanager "build-tools;28.0.3"
2727
# Proto deps
2828
buildscripts/make_dependencies.sh
2929

30-
./gradlew publishToMavenLocal
31-
3230
# Build grpc-cronet
3331

3432
pushd cronet
@@ -46,6 +44,9 @@ pushd android-interop-testing
4644
../gradlew build
4745
popd
4846

47+
# Examples pull dependencies from maven local
48+
./gradlew publishToMavenLocal
49+
4950
# Build examples
5051

5152
cd ./examples/android/clientcache

0 commit comments

Comments
 (0)