From 6c7f391b83ef53532d33c96a142a026ff283db23 Mon Sep 17 00:00:00 2001
From: Johan Lorenzo <jlorenzo@mozilla.com>
Date: Tue, 16 Aug 2022 12:03:26 +0200
Subject: [PATCH] Bug 1783690 - part 8: Let `android-gradle-dependencies` read
`.buildconfig.yml` from the right folder
---
.../scripts/toolchain/android-gradle-dependencies.sh | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/taskcluster/scripts/toolchain/android-gradle-dependencies.sh b/taskcluster/scripts/toolchain/android-gradle-dependencies.sh
index 9117091a587..9fb5ba90140 100755
--- a/taskcluster/scripts/toolchain/android-gradle-dependencies.sh
+++ b/taskcluster/scripts/toolchain/android-gradle-dependencies.sh
@@ -12,11 +12,12 @@ function get_abs_path {
}
CURRENT_DIR="$(get_abs_path $0)"
-PROJECT_DIR="$(get_abs_path $CURRENT_DIR/../../../..)"
+REPO_ROOT_DIR="$(get_abs_path $CURRENT_DIR/../../../..)"
+PROJECT_DIR="$REPO_ROOT_DIR/android-components"
pushd $PROJECT_DIR
-. taskcluster/scripts/toolchain/android-gradle-dependencies/before.sh
+. "$REPO_ROOT_DIR/taskcluster/scripts/toolchain/android-gradle-dependencies/before.sh"
COMPONENT_REGEX='^ ([-a-z]+):$'
# Components to ignore on first pass. They don't have any extra dependencies so we can
@@ -53,6 +54,6 @@ set +e; ./gradlew $GRADLE_ARGS -Pcoverage $TEST_COMMANDS; set -e
:samples-browser:assemble :samples-browser:assembleAndroidTest :samples-browser:test :samples-browser:lint
# :tooling-lint:lintRelease and :samples-browser:lintRelease do not exist
-. taskcluster/scripts/toolchain/android-gradle-dependencies/after.sh
+. "$REPO_ROOT_DIR/taskcluster/scripts/toolchain/android-gradle-dependencies/after.sh"
popd
--
GitLab