From 720d4fab69d611312c6d7439998bb4274879d95f Mon Sep 17 00:00:00 2001 From: Carl Mastrangelo Date: Wed, 25 Apr 2018 15:53:56 -0700 Subject: [PATCH] all: print out diff of methods in android APK --- buildscripts/kokoro/android.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/buildscripts/kokoro/android.sh b/buildscripts/kokoro/android.sh index 0d4ce60d03..dd50d448f4 100755 --- a/buildscripts/kokoro/android.sh +++ b/buildscripts/kokoro/android.sh @@ -65,6 +65,10 @@ cp "$BASE_DIR/github/grpc-java/buildscripts/set_github_status.py" "$SET_GITHUB_S read -r ignored new_dex_count < \ <("${ANDROID_HOME}/tools/bin/apkanalyzer" dex references app/build/outputs/apk/release/app-release-unsigned.apk) +set +x +all_new_methods=`"${ANDROID_HOME}/tools/bin/apkanalyzer" dex packages --proguard-mapping app/build/outputs/mapping/release/mapping.txt app/build/outputs/apk/release/app-release-unsigned.apk | grep ^M | cut -f4 | sort` +set -x + new_apk_size="$(stat --printf=%s app/build/outputs/apk/release/app-release-unsigned.apk)" @@ -79,12 +83,24 @@ cd examples/android/helloworld/ read -r ignored old_dex_count < \ <("${ANDROID_HOME}/tools/bin/apkanalyzer" dex references app/build/outputs/apk/release/app-release-unsigned.apk) +set +x +all_old_methods=`"${ANDROID_HOME}/tools/bin/apkanalyzer" dex packages --proguard-mapping app/build/outputs/mapping/release/mapping.txt app/build/outputs/apk/release/app-release-unsigned.apk | grep ^M | cut -f4 | sort` +set -x + old_apk_size="$(stat --printf=%s app/build/outputs/apk/release/app-release-unsigned.apk)" dex_count_delta="$((new_dex_count-old_dex_count))" apk_size_delta="$((new_apk_size-old_apk_size))" +set +x +dex_method_diff=`diff -u <(echo "$all_old_methods") <(echo "$all_new_methods") || true` +set -x + +if [[ -n "$dex_method_diff" ]] +then + echo "Method diff: ${dex_method_diff}" +fi # Update the statuses with the deltas