Skip to content

Commit

Permalink
Fix android_integration_test to work with the head Android tools. int…
Browse files Browse the repository at this point in the history
…egration_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.
  • Loading branch information
ahumesky committed Jul 11, 2023
1 parent 2aa3137 commit 04e8d24
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/test/shell/bazel/android/android_integration_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down

0 comments on commit 04e8d24

Please sign in to comment.