Fix android_integration_test to work with the head Android tools. integration_test_setup.sh overrides the bazelrc in the test, so it must go before android_helper.sh which appends to the bazelrc to override the Android tools with the version built at head.

ahumesky · ahumesky · commit 04e8d243ead1 · 2023-07-11T19:19:43.000-04:00
diff --git a/src/test/shell/bazel/android/android_integration_test.sh b/src/test/shell/bazel/android/android_integration_test.sh
@@ -26,13 +26,13 @@
 # Load the test setup defined in the parent directory
 CURRENT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
+source "${CURRENT_DIR}/../../integration_test_setup.sh" \
+  || { echo "integration_test_setup.sh not found!" >&2; exit 1; }
+
 source "${CURRENT_DIR}/android_helper.sh" \
   || { echo "android_helper.sh not found!" >&2; exit 1; }
 fail_if_no_android_sdk
 
-source "${CURRENT_DIR}/../../integration_test_setup.sh" \
-  || { echo "integration_test_setup.sh not found!" >&2; exit 1; }
-
 resolve_android_toolchains "$1"
 
 function test_sdk_library_deps() {
