commit fa0bda191fb0a004547233ef2fa7ab5fe4063f92
author Chaohui Wang <chaohuiw@google.com> Fri Aug 25 18:21:29 2023 +0800
committer Chaohui Wang <chaohuiw@google.com> Mon Aug 28 03:12:01 2023 +0000
tree 36c018261fdd571a32c26018b6e31237e0050898
parent be0492463e5332db7d804a9fe2f5d92462977c28

[Spa] Fix build warnings

Also,
 - Upgrade gradle to 8.3
 - Upgrade AGP to 8.1.1

Bug: 289155281
Test: Gradle Sync
Test: unit test
Change-Id: Id9e966f5b392276509a7a917598f70c6702f9061

packages/SettingsLib/Spa/gradlew

diff --git a/packages/SettingsLib/Spa/gradlew b/packages/SettingsLib/Spa/gradlew
index aeb74cb..fcb6fca 100755
--- a/packages/SettingsLib/Spa/gradlew
+++ b/packages/SettingsLib/Spa/gradlew
@@ -130,10 +130,13 @@
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.