commit dd8a6e91e701a19757e406beef06688193258962
author Jeff Gaston <jeffrygaston@google.com> Tue Sep 01 14:26:49 2020 -0400
committer Jeff Gaston <jeffrygaston@google.com> Thu Sep 03 09:36:56 2020 -0400
tree 0124b1dbabe1947f0d8d487c1d08a20b8a314278
parent 0b098714251b0b03b92b22971bc3108a36e4bb32

Having gradlew resolve symlinks in OUT_DIR and DIST_DIR before running Gradle

so that if Gradle later resolves symlinks, build_log_simplifier.py can recognize them by a text match

Bug: 140635374
Test: DIST_DIR=somesymlink ./busytown/androidx.sh
Change-Id: I1fb276a4d1d9306fc619b87dfe1ae9d2a8c58b08

gradlew

diff --git a/gradlew b/gradlew
index 8f6607a..aa73e6f 100755
--- a/gradlew
+++ b/gradlew
@@ -10,21 +10,21 @@
 
 # --------- androidx specific code needed for build server. ------------------
 
-SCRIPT_PATH="$(cd $(dirname $0) && pwd)"
+SCRIPT_PATH="$(cd $(dirname $0) && pwd -P)"
 if [ -n "$OUT_DIR" ] ; then
     mkdir -p "$OUT_DIR"
-    OUT_DIR="$(cd $OUT_DIR && pwd)"
+    OUT_DIR="$(cd $OUT_DIR && pwd -P)"
     export GRADLE_USER_HOME="$OUT_DIR/.gradle"
     export TMPDIR=$OUT_DIR
 else
-    CHECKOUT_ROOT="$(cd $SCRIPT_PATH/../.. && pwd)"
+    CHECKOUT_ROOT="$(cd $SCRIPT_PATH/../.. && pwd -P)"
     export OUT_DIR="$CHECKOUT_ROOT/out"
 fi
 
 XMX_ARG="$(cd $SCRIPT_PATH && grep org.gradle.jvmargs gradle.properties | sed 's/^/-D/')"
 if [ -n "$DIST_DIR" ]; then
     mkdir -p "$DIST_DIR"
-    DIST_DIR="$(cd $DIST_DIR && pwd)"
+    DIST_DIR="$(cd $DIST_DIR && pwd -P)"
     export LINT_PRINT_STACKTRACE=true
 
     #Set the initial heap size to match the max heap size,