Update cmdline-tools to ab/11318615 am: c5ee6d3888

Original change: https://android-review.googlesource.com/c/platform/prebuilts/cmdline-tools/+/2911905 Change-Id: Ie5230724e8566db89d3f7984b44a2cfc823101e0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
author: Cole Faust <colefaust@google.com> 2024-01-17 00:39:48 +0000
committer: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-01-17 00:39:48 +0000
commit: bb9cc5eb15596de11fe2264962ac993d893a9d0f (patch)
tree: c9d83d4c546c7b61f935c6c062fdb710db00aae2
parent: 5fae95005a28054be0d9d4bc34fe06c19a4d4337 (diff)
parent: c5ee6d3888cadf826abffbb816d973026bd6b831 (diff)
download: cmdline-tools-bb9cc5eb15596de11fe2264962ac993d893a9d0f.tar.gz
34 files changed, 372 insertions, 28 deletions
diff --git a/lint-tests.jar b/lint-tests.jar
index bf3c854..744992c 100644
--- a/lint-tests.jar
+++ b/lint-tests.jar
diff --git a/manifest.xml b/manifest.xml
index ad85602..1f2c782 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -7,7 +7,7 @@
 
   <superproject name="platform/superproject/base" remote="goog" revision="studio-main" />
 
-  <project path="tools/buildSrc" name="platform/tools/buildSrc" revision="87cf13125a30c16968d615b02cfa2d059f40a0c8">
+  <project path="tools/buildSrc" name="platform/tools/buildSrc" revision="c876f022e8195b8e21843e3f9ea8a4a4934edb94">
     <linkfile dest="tools/build.gradle" src="base/build.gradle" />
 
     <linkfile dest="tools/gradle.properties" src="base/gradle.properties" />
@@ -19,9 +19,9 @@
     <copyfile dest="tools/gradlew.bat" src="base/gradlew.bat" />
 </project>
 
-  <project path="external/dexter" name="platform/tools/dexter" revision="74c2cf6b983956ac8e9a23422a4d6a08c0019bf5" />
+  <project path="external/dexter" name="platform/tools/dexter" revision="861a1b26fc155344d9746afec6f8b6cf4ea3e2d8" />
 
-  <project path="external/doclava" name="platform/external/doclava" revision="512ec266ba3aa10dfd7e6c3e247d7c6a90257616" />
+  <project path="external/doclava" name="platform/external/doclava" revision="78f048aa5520a28c16c31f9e1d7a7635a2c71e35" />
 
   <project path="external/dokka" name="platform/external/dokka" groups="pdk" clone-depth="1" revision="8541ac1c032c1641578d2964553222f01a265f2d" />
 
@@ -35,7 +35,7 @@
 
   <project path="external/jarjar" name="platform/external/jarjar" revision="741153e06175fbe4c2da2ad2ab8b704d9ab30259" />
 
-  <project path="external/jetbrains/kotlin" name="platform/external/jetbrains/kotlin" revision="d587ea4db3f1920ab5772c2496879e842228f296" />
+  <project path="external/jetbrains/kotlin" name="platform/external/jetbrains/kotlin" revision="b6d7af5254330703361c620e286f040110536ba1" />
 
   <project path="external/jetbrains/rust" name="platform/external/jetbrains/intellij-rust" revision="34fa7ba7266843bf21641c380b8068c9969bed5a" />
 
@@ -69,17 +69,17 @@
 
   <project path="prebuilts/python/windows-x86" name="platform/prebuilts/python/windows-x86" clone-depth="1" revision="6afb84b14219361d32631cf71a7b8076b4673e03" />
 
-  <project path="prebuilts/r8" name="platform/prebuilts/r8" clone-depth="1" revision="eac24b7a146c3ee448ac0405a67b94a8335fad17" />
+  <project path="prebuilts/r8" name="platform/prebuilts/r8" clone-depth="1" revision="c53ae8a007f800903635a308c765674425e98398" />
 
-  <project path="prebuilts/studio/jdk" name="platform/prebuilts/studio/jdk" clone-depth="1" revision="6d714ef709fcf686a3161b7cc612a121ec3f26de" />
+  <project path="prebuilts/studio/jdk" name="platform/prebuilts/studio/jdk" clone-depth="1" revision="6dbf45526bb95b48e35d04412683a724798e9b98" />
 
-  <project path="prebuilts/studio/layoutlib" name="platform/prebuilts/studio/layoutlib" clone-depth="1" revision="1ffc0b707fb3e3cde181f60efcd31ef85ad616f4" />
+  <project path="prebuilts/studio/layoutlib" name="platform/prebuilts/studio/layoutlib" clone-depth="1" revision="6765999de85d8b5d4fc9defb9cc55f4eb20ad80b" />
 
-  <project path="prebuilts/tools" name="platform/prebuilts/tools" clone-depth="1" revision="fd283955884e3ab24ddb6db6ed13f1c360e89d15" />
+  <project path="prebuilts/tools" name="platform/prebuilts/tools" clone-depth="1" revision="4cae8c4116ae21be2110a99c1fb8b4a4489e7906" />
 
-  <project path="tools/adt/idea" name="platform/tools/adt/idea" revision="7c13ab7d11b9e56cea9285ebb99dcef4c961c9cd" />
+  <project path="tools/adt/idea" name="platform/tools/adt/idea" revision="f75d4536ae901a28fcad0e7bc16f1d7bfc7cc9b8" />
 
-  <project path="tools/analytics-library" name="platform/tools/analytics-library" revision="7471b3b49900d107fc22cf0e173e5826baef4e37" />
+  <project path="tools/analytics-library" name="platform/tools/analytics-library" revision="e999491ccbb7145488108505d8278c0c9ed0efea" />
 
   <project path="tools/apksig" name="platform/tools/apksig" revision="c8811a8c5bfa362bfb4473f83473ba41b79455c2" />
 
@@ -87,7 +87,7 @@
 
   <project path="tools/assets" name="assets/android-studio-ux-assets" clone-depth="1" revision="12cb5d3f886788b74450295f62da9d7517e7ba94" />
 
-  <project path="tools/base" name="platform/tools/base" revision="1cf98c7305485fd508c2c73448822a2c6981dd06">
+  <project path="tools/base" name="platform/tools/base" revision="c8172f382618454f3fa33602f5878bc71b8b1426">
     <linkfile dest="tools/BUILD.bazel" src="bazel/tools.BUILD.bazel" />
 
     <linkfile dest="WORKSPACE" src="bazel/toplevel.WORKSPACE" />
@@ -105,33 +105,33 @@
     <linkfile dest="prebuilts/clang/studio-extra/wrapped_ar.darwin" src="bazel/toolchains/darwin/wrapped_ar" />
 </project>
 
-  <project path="tools/data-binding" name="platform/frameworks/data-binding" revision="855177808ddc495cad3d9ec6e09c1ed1c529ef5f" />
+  <project path="tools/data-binding" name="platform/frameworks/data-binding" revision="7d27ec5073dd18f932fdafe30f066781df0b6406" />
 
   <project path="tools/external/bazelbuild-rules-kotlin" name="platform/tools/external/bazelbuild-rules-kotlin" revision="cab5eaffc2012dfe46260c03d6419c0d2fa10be0" />
 
   <project path="tools/external/fat32lib" name="platform/tools/external/fat32lib" revision="5d8a9ce6a1801939006a451dfffe4f11d6211cfb" />
 
-  <project path="tools/external/gradle" name="platform/tools/external/gradle" clone-depth="1" revision="0b2646633292f08997203c7fddfa0bd101ded4f1" />
+  <project path="tools/external/gradle" name="platform/tools/external/gradle" clone-depth="1" revision="605697429e59f25e86d60b90ad67549d8ee6c22f" />
 
-  <project path="tools/gradle" name="platform/tools/gradle" revision="e04a1123f0a42dcc2d59357056a14883bfab5328" />
+  <project path="tools/gradle" name="platform/tools/gradle" revision="5c009b06bfb1d51ef649019eda1f09046ae03efd" />
 
-  <project path="tools/gradle-recipes" name="platform/tools/gradle-recipes" revision="0e37d2ee90ff420fefed6daabc0329fd96ad9476" />
+  <project path="tools/gradle-recipes" name="platform/tools/gradle-recipes" revision="f0829a0e73ddf0d79a47df17ea0c1e56b38975ef" />
 
-  <project path="tools/idea" name="platform/tools/idea" revision="f81806ac06098b0aa8c2f8e80598916c1a205ea0" />
+  <project path="tools/idea" name="platform/tools/idea" revision="feccc2d0af08b6a3fe8fa04dd119fd9cb242302a" />
 
   <project path="tools/repohooks" name="platform/tools/repohooks" revision="f37726d2268fe61ef1697ecb32963657a45b3964" />
 
   <project path="tools/sherpa" name="platform/frameworks/opt/sherpa" revision="c0de6383b1db33a235451a7b0f806a0b2d1fae6a" />
 
-  <project path="tools/studio/google/cloud/testing" name="platform/tools/studio/google/cloud/testing" revision="a4d4eca4762cbe5d6eaf0562c51a459ada3a0c55" />
+  <project path="tools/studio/google/cloud/testing" name="platform/tools/studio/google/cloud/testing" revision="9b768dd4c2756f4851c3db8e63ff05e248a61a03" />
 
-  <project path="tools/studio/google/cloud/tools" name="platform/tools/studio/google/cloud/tools" revision="1a34c03052256dcdfb1afdd65de4efd96a621267" />
+  <project path="tools/studio/google/cloud/tools" name="platform/tools/studio/google/cloud/tools" revision="b1e739f64940a9f8f2109846d07d1105ce041caf" />
 
   <project path="tools/swing-testing" name="platform/tools/swing-testing" revision="02b8679e02caa4b83bc2b06e2925a7e0c7cff7cb" />
 
-  <project path="tools/vendor/google" name="platform/tools/vendor/google" revision="d3f6978df5ffe3a60ca01d459f26956dbe0d2edd" />
+  <project path="tools/vendor/google" name="platform/tools/vendor/google" revision="54af98cb59106e614fc8f80846fce8f3c0dea30e" />
 
-  <project path="tools/vendor/google3/blaze" name="platform/tools/vendor/google3/blaze" revision="5c4e50cc7f58f73e85b0d9fdbc4d66cf4023115a" />
+  <project path="tools/vendor/google3/blaze" name="platform/tools/vendor/google3/blaze" revision="be3d4de5c78c3fcdca5743a1cc823df55bb5cfca" />
 
   <project path="tools/vendor/intel" name="platform/tools/vendor/intel" revision="1212619833f94165022ac6ba46a434d88fef37b4" />
 
@@ -139,21 +139,21 @@
 
   <project path="tools/vendor/adt_infra_internal" name="platform/tools/adt_infra_internal" groups="adt-infra" revision="cc1b20c3a8bc893e1addd5834b728ed8f9fde531" />
 
-  <project path="prebuilts/studio/buildbenchmarks" name="platform/tools/vendor/google_prebuilt/buildbenchmarks" clone-depth="1" revision="2dec86faeeb5ac8fd690527159cf6a6f1c5d96c2" />
+  <project path="prebuilts/studio/buildbenchmarks" name="platform/tools/vendor/google_prebuilt/buildbenchmarks" clone-depth="1" revision="8d638083b1685716913f7671c4508dd4c648c7a6" />
 
   <project path="prebuilts/android-emulator" name="platform/prebuilts/android-emulator" clone-depth="1" revision="260b7e55cf3cab6efa5d07afddb971ab677ceee0" />
 
   <project path="prebuilts/studio/sdk/remote" name="platform/tools/google_prebuilts/studio/sdk/remote" clone-depth="1" revision="ca0d61a5587a77d861a4484484fb4b86ff490aac" />
 
-  <project path="prebuilts/studio/intellij-sdk" name="platform/tools/vendor/google_prebuilts/studio/intellij-sdk" clone-depth="1" revision="76958c1e4c0ceaf13a76cdda481aed0f3146490d" />
+  <project path="prebuilts/studio/intellij-sdk" name="platform/tools/vendor/google_prebuilts/studio/intellij-sdk" clone-depth="1" revision="9e9a51c3f119379516e3d87bff25a202fbe3654a" />
 
-  <project path="prebuilts/studio/sdk/darwin" name="platform/tools/vendor/google_prebuilts/studio/sdk/darwin" clone-depth="1" groups="notdefault,platform-darwin" revision="1acab096f09453e03f4ba9188cc8f6d1a94c238b" />
+  <project path="prebuilts/studio/sdk/darwin" name="platform/tools/vendor/google_prebuilts/studio/sdk/darwin" clone-depth="1" groups="notdefault,platform-darwin" revision="21e0bfb548f2cf39e42b697d5212510c6fb83d26" />
 
-  <project path="prebuilts/studio/sdk/linux" name="platform/tools/vendor/google_prebuilts/studio/sdk/linux" clone-depth="1" groups="notdefault,platform-linux" revision="1fa16161f989d51e439d0ba11f08e66b73bcd139" />
+  <project path="prebuilts/studio/sdk/linux" name="platform/tools/vendor/google_prebuilts/studio/sdk/linux" clone-depth="1" groups="notdefault,platform-linux" revision="3463695fbabbfba991a0ca47aeaa0f4e35af09dd" />
 
-  <project path="prebuilts/studio/sdk/windows" name="platform/tools/vendor/google_prebuilts/studio/sdk/windows" clone-depth="1" groups="notdefault,platform-windows" revision="0960cf20bc1afa18ba48ba150b5e71828d68a6e9" />
+  <project path="prebuilts/studio/sdk/windows" name="platform/tools/vendor/google_prebuilts/studio/sdk/windows" clone-depth="1" groups="notdefault,platform-windows" revision="c90e290c799c2c9e33918bddf40b9dfe34fb80e2" />
 
-  <project path="prebuilts/remoteexecution-client" name="platform/prebuilts/remoteexecution-client" revision="62010ec1f1ed8dfb7bb6f208127eebce20dd362b" clone-depth="1" />
+  <project path="prebuilts/remoteexecution-client" name="platform/prebuilts/remoteexecution-client" revision="90545e59fe771ba6bf003abd8f13ee7d4a961d88" clone-depth="1" />
 
   <repo-hooks in-project="platform/tools/repohooks" enabled-list="pre-upload" />
 </manifest>
diff --git a/tools/bin/d8 b/tools/bin/d8
new file mode 100755
index 0000000..7fa7c4f
--- /dev/null
+++ b/tools/bin/d8
@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  d8 start up script for Linux
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/.." >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="d8"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and D8_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=''
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/lib/d8-classpath.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    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.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $D8_OPTS -classpath "\"$CLASSPATH\"" com.android.tools.r8.D8 "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/tools/bin/r8 b/tools/bin/r8
new file mode 100755
index 0000000..86e8e0e
--- /dev/null
+++ b/tools/bin/r8
@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  r8 start up script for Linux
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/.." >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="r8"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and R8_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=''
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/lib/r8-classpath.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    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.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $R8_OPTS -classpath "\"$CLASSPATH\"" com.android.tools.r8.R8 "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/tools/lib/analytics-library/protos/src/main/proto/proto.jar b/tools/lib/analytics-library/protos/src/main/proto/proto.jar
index 63253f7..8496289 100755
--- a/tools/lib/analytics-library/protos/src/main/proto/proto.jar
+++ b/tools/lib/analytics-library/protos/src/main/proto/proto.jar
diff --git a/tools/lib/analytics-library/shared/tools.analytics-shared.jar b/tools/lib/analytics-library/shared/tools.analytics-shared.jar
index 8a723dc..8d0faa3 100755
--- a/tools/lib/analytics-library/shared/tools.analytics-shared.jar
+++ b/tools/lib/analytics-library/shared/tools.analytics-shared.jar
diff --git a/tools/lib/analytics-library/tracker/tools.analytics-tracker.jar b/tools/lib/analytics-library/tracker/tools.analytics-tracker.jar
index 7023ce9..25b5021 100755
--- a/tools/lib/analytics-library/tracker/tools.analytics-tracker.jar
+++ b/tools/lib/analytics-library/tracker/tools.analytics-tracker.jar
diff --git a/tools/lib/annotations/annotations.jar b/tools/lib/annotations/annotations.jar
index 761abcb..ab06507 100755
--- a/tools/lib/annotations/annotations.jar
+++ b/tools/lib/annotations/annotations.jar
diff --git a/tools/lib/apkanalyzer-classpath.jar b/tools/lib/apkanalyzer-classpath.jar
index 57afde5..b13e803 100755
--- a/tools/lib/apkanalyzer-classpath.jar
+++ b/tools/lib/apkanalyzer-classpath.jar
diff --git a/tools/lib/avdmanager-classpath.jar b/tools/lib/avdmanager-classpath.jar
index b2e6a88..f249e47 100755
--- a/tools/lib/avdmanager-classpath.jar
+++ b/tools/lib/avdmanager-classpath.jar
diff --git a/tools/lib/build-system/builder-model/builder-model.jar b/tools/lib/build-system/builder-model/builder-model.jar
index bb7f33d..880a02b 100755
--- a/tools/lib/build-system/builder-model/builder-model.jar
+++ b/tools/lib/build-system/builder-model/builder-model.jar
diff --git a/tools/lib/build-system/shrinker/libshrinker.jar b/tools/lib/build-system/shrinker/libshrinker.jar
index 72bc863..2774dfb 100755
--- a/tools/lib/build-system/shrinker/libshrinker.jar
+++ b/tools/lib/build-system/shrinker/libshrinker.jar
diff --git a/tools/lib/build-system/tools.manifest-merger.jar b/tools/lib/build-system/tools.manifest-merger.jar
index 145010d..0813627 100755
--- a/tools/lib/build-system/tools.manifest-merger.jar
+++ b/tools/lib/build-system/tools.manifest-merger.jar
diff --git a/tools/lib/common/tools.common.jar b/tools/lib/common/tools.common.jar
index 23a7a59..33ed10b 100755
--- a/tools/lib/common/tools.common.jar
+++ b/tools/lib/common/tools.common.jar
diff --git a/tools/lib/d8-classpath.jar b/tools/lib/d8-classpath.jar
new file mode 100755
index 0000000..4e649f9
--- /dev/null
+++ b/tools/lib/d8-classpath.jar
diff --git a/tools/lib/ddmlib/tools.ddmlib.jar b/tools/lib/ddmlib/tools.ddmlib.jar
index 2e005f2..0c127dc 100755
--- a/tools/lib/ddmlib/tools.ddmlib.jar
+++ b/tools/lib/ddmlib/tools.ddmlib.jar
diff --git a/tools/lib/lint-classpath.jar b/tools/lib/lint-classpath.jar
index 733296d..358046b 100755
--- a/tools/lib/lint-classpath.jar
+++ b/tools/lib/lint-classpath.jar
diff --git a/tools/lib/lint/cli/cli.jar b/tools/lib/lint/cli/cli.jar
index a833044..16b8610 100755
--- a/tools/lib/lint/cli/cli.jar
+++ b/tools/lib/lint/cli/cli.jar
diff --git a/tools/lib/lint/tools.lint-api.jar b/tools/lib/lint/tools.lint-api.jar
index 29f32f3..6a5ad0f 100755
--- a/tools/lib/lint/tools.lint-api.jar
+++ b/tools/lib/lint/tools.lint-api.jar
diff --git a/tools/lib/lint/tools.lint-checks.jar b/tools/lib/lint/tools.lint-checks.jar
index 9238332..371be43 100755
--- a/tools/lib/lint/tools.lint-checks.jar
+++ b/tools/lib/lint/tools.lint-checks.jar
diff --git a/tools/lib/lint/tools.lint-model.jar b/tools/lib/lint/tools.lint-model.jar
index 86649ca..0ce4762 100755
--- a/tools/lib/lint/tools.lint-model.jar
+++ b/tools/lib/lint/tools.lint-model.jar
diff --git a/tools/lib/profgen-classpath.jar b/tools/lib/profgen-classpath.jar
index 3b648ef..65352ae 100755
--- a/tools/lib/profgen-classpath.jar
+++ b/tools/lib/profgen-classpath.jar
diff --git a/tools/lib/profgen/profgen-cli/libprofgen-cli-lib.jar b/tools/lib/profgen/profgen-cli/libprofgen-cli-lib.jar
index a23d384..5cc28e8 100755
--- a/tools/lib/profgen/profgen-cli/libprofgen-cli-lib.jar
+++ b/tools/lib/profgen/profgen-cli/libprofgen-cli-lib.jar
diff --git a/tools/lib/profgen/profgen/libprofgen.jar b/tools/lib/profgen/profgen/libprofgen.jar
index f32236e..d41ecdb 100755
--- a/tools/lib/profgen/profgen/libprofgen.jar
+++ b/tools/lib/profgen/profgen/libprofgen.jar
diff --git a/tools/lib/r8-classpath.jar b/tools/lib/r8-classpath.jar
new file mode 100755
index 0000000..4e649f9
--- /dev/null
+++ b/tools/lib/r8-classpath.jar
diff --git a/tools/lib/r8.jar b/tools/lib/r8.jar
index cd8d26e..823fc97 100755
--- a/tools/lib/r8.jar
+++ b/tools/lib/r8.jar
diff --git a/tools/lib/resourceshrinker-classpath.jar b/tools/lib/resourceshrinker-classpath.jar
index 92b0b23..56223bf 100755
--- a/tools/lib/resourceshrinker-classpath.jar
+++ b/tools/lib/resourceshrinker-classpath.jar
diff --git a/tools/lib/retrace-classpath.jar b/tools/lib/retrace-classpath.jar
index 5ddf0e3..4e649f9 100755
--- a/tools/lib/retrace-classpath.jar
+++ b/tools/lib/retrace-classpath.jar
diff --git a/tools/lib/screenshot2-classpath.jar b/tools/lib/screenshot2-classpath.jar
index f0eaf0c..c224d7a 100755
--- a/tools/lib/screenshot2-classpath.jar
+++ b/tools/lib/screenshot2-classpath.jar
diff --git a/tools/lib/sdk-common/tools.sdk-common.jar b/tools/lib/sdk-common/tools.sdk-common.jar
index 3bc2dbb..ecede21 100755
--- a/tools/lib/sdk-common/tools.sdk-common.jar
+++ b/tools/lib/sdk-common/tools.sdk-common.jar
diff --git a/tools/lib/sdklib/sdklib.core.jar b/tools/lib/sdklib/sdklib.core.jar
index 1fd819d..c462c3d 100755
--- a/tools/lib/sdklib/sdklib.core.jar
+++ b/tools/lib/sdklib/sdklib.core.jar
diff --git a/tools/lib/sdklib/tools.sdklib.jar b/tools/lib/sdklib/tools.sdklib.jar
index 7333e12..a9a029b 100755
--- a/tools/lib/sdklib/tools.sdklib.jar
+++ b/tools/lib/sdklib/tools.sdklib.jar
diff --git a/tools/lib/sdkmanager-classpath.jar b/tools/lib/sdkmanager-classpath.jar
index d5cf505..12f7a59 100755
--- a/tools/lib/sdkmanager-classpath.jar
+++ b/tools/lib/sdkmanager-classpath.jar
diff --git a/tools/source.properties b/tools/source.properties
index 0b5b1c1..4b2dc6f 100755
--- a/tools/source.properties
+++ b/tools/source.properties
@@ -1,3 +1,3 @@
-Pkg.Revision=14.0-alpha03
-Pkg.Path=cmdline-tools;14.0-alpha03
+Pkg.Revision=14.0-alpha04
+Pkg.Path=cmdline-tools;14.0-alpha04
 Pkg.Desc=Android SDK Command-line Tools
author	Cole Faust <colefaust@google.com>	2024-01-17 00:39:48 +0000
committer	Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>	2024-01-17 00:39:48 +0000
commit	bb9cc5eb15596de11fe2264962ac993d893a9d0f (patch)
tree	c9d83d4c546c7b61f935c6c062fdb710db00aae2
parent	5fae95005a28054be0d9d4bc34fe06c19a4d4337 (diff)
parent	c5ee6d3888cadf826abffbb816d973026bd6b831 (diff)
download	cmdline-tools-bb9cc5eb15596de11fe2264962ac993d893a9d0f.tar.gz