Snap for 10453563 from ecb9355ef5192911d107c9fc08a024706e68db25 to mainline-uwb-releaseaml_uwb_341513070aml_uwb_341511050aml_uwb_341310300aml_uwb_341310030aml_uwb_341111010aml_uwb_341011000android14-mainline-uwb-release

Change-Id: Ifcd5802ea8a6315e203eedabb7f3580eb72046e6

96 files changed, 454 insertions, 189 deletions

diff --git a/Android.bp b/Android.bp
index c16cc51..ffc64fb 100644
--- a/Android.bp
+++ b/Android.bp
@@ -40,7 +40,8 @@ java_import_host {
         // A subset of the jars listed in MANIFEST.MF in
         // tools/lib/lint-classpath.jar needed to provide dependencies
         // of lint-api.jar and lint-checks.jar.
-        "tools/lib/external/com/google/guava/guava/30.1-jre/guava-30.1-jre.jar",
+        "tools/lib/external/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar",
+        "tools/lib/external/com/google/guava/guava/31.0.1-jre/guava-31.0.1-jre.jar",
         "tools/lib/external/lint-psi/intellij-core/intellij-core-mvn.jar",
         "tools/lib/external/lint-psi/kotlin-compiler/kotlin-compiler-mvn.jar",
         "tools/lib/external/lint-psi/uast/uast.jar",
@@ -77,14 +78,39 @@ java_binary_host {
     wrapper: "tools/bin/lint",
 }
 
+java_genrule_host {
+    name: "resourceshrinker-classpath",
+    srcs: [
+        "tools/lib/resourceshrinker-classpath.jar",
+        "tools/lib/**/*.jar",
+    ],
+    out: [
+        "resourceshrinker-classpath.jar",
+    ],
+    tools: [
+        "merge_zips",
+    ],
+    cmd: "unzip -pq $(location tools/lib/resourceshrinker-classpath.jar) META-INF/MANIFEST.MF > $(genDir)/list && " +
+        "for jar in $$(grep '\\.jar' $(genDir)/list); do " +
+        " echo $$(dirname $(location tools/lib/resourceshrinker-classpath.jar))/$${jar}; " +
+        "done > $(genDir)/jars && " +
+        "$(location merge_zips) -j -ignore-duplicates -stripFile 'META-INF/*.SF' -stripFile 'META-INF/*.DSA' $(out) $$(cat $(genDir)/jars)",
+}
+
+java_binary_host {
+    name: "resourceshrinker",
+    static_libs: ["resourceshrinker-classpath"],
+    wrapper: "tools/bin/resourceshrinker",
+}
+
 java_import_host {
     name: "lint_tests",
     jars: [
         "lint-tests.jar",
         "tools/lib/common/tools.common.jar",
-        "tools/lib/external/org/ow2/asm/asm/9.1/asm-9.1.jar",
-        "tools/lib/external/org/ow2/asm/asm-analysis/9.1/asm-analysis-9.1.jar",
-        "tools/lib/external/org/ow2/asm/asm-tree/9.1/asm-tree-9.1.jar",
+        "tools/lib/external/org/ow2/asm/asm/9.2/asm-9.2.jar",
+        "tools/lib/external/org/ow2/asm/asm-analysis/9.2/asm-analysis-9.2.jar",
+        "tools/lib/external/org/ow2/asm/asm-tree/9.2/asm-tree-9.2.jar",
         "tools/lib/layoutlib-api/tools.layoutlib-api.jar",
         "tools/lib/lint/cli/cli.jar",
         "tools/lib/sdk-common/tools.sdk-common.jar",
diff --git a/AndroidGlobalLintChecker.jar b/AndroidGlobalLintChecker.jar
new file mode 100644
index 0000000..995e3a7
--- /dev/null
+++ b/AndroidGlobalLintChecker.jar
diff --git a/lint-tests.jar b/lint-tests.jar
index e313b82..f4361f8 100644
--- a/lint-tests.jar
+++ b/lint-tests.jar
diff --git a/manifest.xml b/manifest.xml
index 072554e..8dacc5e 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -7,7 +7,7 @@
 
   <superproject name="platform/superproject" remote="goog" />
 
-  <project path="tools/buildSrc" name="platform/tools/buildSrc" revision="bb0a154ca189bef38824f9fc3425f648007950b8">
+  <project path="tools/buildSrc" name="platform/tools/buildSrc" revision="6bae01d0d4c155ed5dcf27d6460dd20b6bfdefdd">
     <linkfile dest="tools/build.xml" src="base/build.xml" />
 
     <linkfile dest="tools/build.gradle" src="base/build.gradle" />
@@ -21,11 +21,11 @@
     <copyfile dest="tools/gradlew.bat" src="base/gradlew.bat" />
 </project>
 
-  <project path="external/dexter" name="platform/tools/dexter" revision="f7a8d630eeede9d2bf12ab06725a5a3e69947940" />
+  <project path="external/dexter" name="platform/tools/dexter" revision="74c2cf6b983956ac8e9a23422a4d6a08c0019bf5" />
 
-  <project path="external/doclava" name="platform/external/doclava" revision="11988617c6031d02220f8e515ed3347752296478" />
+  <project path="external/doclava" name="platform/external/doclava" revision="1c1e56e8e8b59eee6ce7da861e376f7f80c17046" />
 
-  <project path="external/dokka" name="platform/external/dokka" groups="pdk" clone-depth="1" revision="1561cf03a908b651be77ab3adc54d8672bb7d852" />
+  <project path="external/dokka" name="platform/external/dokka" groups="pdk" clone-depth="1" revision="2cb80150c4bcdcd31dc10a82ef5a17f7a73a0ee5" />
 
   <project path="external/freetype" name="platform/external/freetype" revision="93615c094b6b7a87b751916f79fe8849477d7ca8" upstream="qt-release" />
 
@@ -35,6 +35,12 @@
 
   <project path="external/grpc-grpc" name="platform/external/grpc-grpc" revision="fcecb51d25341dc00a016f42da3e442741d259ae" />
 
+  <project path="external/jarjar" name="platform/external/jarjar" revision="d3621fd17af424efc1fe4b527531e0b5282e77ee" />
+
+  <project path="external/jetbrains/intellij-kotlin" name="platform/external/jetbrains/intellij-kotlin" revision="ecbeae4c5a63ea1451307503d74abfb734f60c42" />
+
+  <project path="external/jetbrains/kotlin" name="platform/external/jetbrains/kotlin" revision="d587ea4db3f1920ab5772c2496879e842228f296" />
+
   <project path="external/libpng" name="platform/external/libpng" revision="80c03e1c7bd6d3edebe795375103927bef2b67f3" upstream="qt-release" />
 
   <project path="external/nanopb-c" name="platform/external/nanopb-c" revision="be60d29e9e0f3c18da2e61619ab24c372788e4fe" />
@@ -43,49 +49,51 @@
 
   <project path="external/protobuf" name="platform/external/protobuf" revision="98500ad15567e0666d4eb3b371da0b10365bb66e" />
 
-  <project path="external/skia" name="platform/external/skia" revision="0c9cb089e72b0fb74a5b3c01cc5cc417696a8006" clone-depth="1" />
+  <project path="external/skia" name="platform/external/skia" revision="d867128b8de46d2c84a63088784aaf4de0b2a224" clone-depth="1" />
 
   <project path="external/zlib" name="platform/external/zlib" revision="be7619f2bc6a109bba24422fd54d41f909e0ee56" />
 
-  <project path="frameworks/layoutlib" name="platform/frameworks/layoutlib" clone-depth="1" revision="d75bfd638cff2f3d6e2da5fe956e8a9d3eebc7e2" upstream="sc-layoutlib-native" groups="notdefault,layoutlib" />
+  <project path="frameworks/layoutlib" name="platform/frameworks/layoutlib" clone-depth="1" revision="bdeb89aae889c813e969835b1047ea5572979c50" upstream="tm-layoutlib-native" groups="notdefault,layoutlib" />
 
-  <project path="prebuilts/clang/host/darwin-x86" name="platform/prebuilts/clang/host/darwin-x86" clone-depth="1" groups="notdefault,platform-darwin" revision="565d3a6e11289b60f5cb11b6ca9b366f6c2bcaf9" />
+  <project path="prebuilts/clang/host/darwin-x86" name="platform/prebuilts/clang/host/darwin-x86" clone-depth="1" groups="notdefault,platform-darwin" revision="4aaead81b6c35a7f10ac51bccf97c3ffc768aabe" />
 
-  <project path="prebuilts/clang/host/linux-x86" name="platform/prebuilts/clang/host/linux-x86" clone-depth="1" groups="notdefault,platform-linux" revision="b86a4fd3b59b190985730d726f1aa07ad08a8e22" />
+  <project path="prebuilts/clang/host/linux-x86" name="platform/prebuilts/clang/host/linux-x86" clone-depth="1" groups="notdefault,platform-linux" revision="1abd69f7a7781a7952a0671c25d1595a5ede52a1" />
 
-  <project path="prebuilts/clang/host/windows-x86" name="platform/prebuilts/clang/host/windows-x86" clone-depth="1" groups="notdefault,platform-windows" revision="7e712d965df2cd01c00ae3d0412efcb0e0dbe90b" />
+  <project path="prebuilts/clang/host/windows-x86" name="platform/prebuilts/clang/host/windows-x86" clone-depth="1" groups="notdefault,platform-windows" revision="e808b7ac829651e6477ee9c92cbbfee11e90c7ce" />
 
-  <project path="prebuilts/python/darwin-x86" name="platform/prebuilts/python/darwin-x86" clone-depth="1" revision="ddb257fb641b9d2baef9ac2c682fd13b97c90fbd" />
+  <project path="prebuilts/python/darwin-x86" name="platform/prebuilts/python/darwin-x86" clone-depth="1" revision="881e364abacb83a0edea96334cf98b1766da6fa7" />
 
-  <project path="prebuilts/python/linux-x86" name="platform/prebuilts/python/linux-x86" clone-depth="1" revision="4137aff695497411699882e3ba8ad78676db4f9a" />
+  <project path="prebuilts/python/linux-x86" name="platform/prebuilts/python/linux-x86" clone-depth="1" revision="2729a2e1dcbe0316bf902839be2e39668edd5db7" />
 
-  <project path="prebuilts/python/windows-x86" name="platform/prebuilts/python/windows-x86" clone-depth="1" revision="63572227f69bb5c2a7901d4eb82a991c2b363c1d" />
+  <project path="prebuilts/python/windows-x86" name="platform/prebuilts/python/windows-x86" clone-depth="1" revision="94e76550816f03744dd8e5ced61da78cf97a8871" />
 
-  <project path="prebuilts/r8" name="platform/prebuilts/r8" clone-depth="1" revision="a2198bffdc7e9f3003fedd0fdd1629d0e4ec9f03" />
+  <project path="prebuilts/r8" name="platform/prebuilts/r8" clone-depth="1" revision="272b19f509ccd63b6f6468a1952c0141ff2616a1" />
 
-  <project path="prebuilts/studio/jdk" name="platform/prebuilts/studio/jdk" clone-depth="1" revision="f51334658ed9a55b0465cdba149a59a7229b9a71" />
+  <project path="prebuilts/studio/jdk" name="platform/prebuilts/studio/jdk" clone-depth="1" revision="2c3cc1830c238ba62a4f86e82b249dbf2f74f842" />
 
-  <project path="prebuilts/studio/layoutlib" name="platform/prebuilts/studio/layoutlib" clone-depth="1" revision="0916fb049e38afe8e8a89ebc88deb87732a6f6cd" />
+  <project path="prebuilts/studio/layoutlib" name="platform/prebuilts/studio/layoutlib" clone-depth="1" revision="7e7beecbe3c72f7505c985f1d0760ade26cbee21" />
 
-  <project path="prebuilts/tools" name="platform/prebuilts/tools" clone-depth="1" revision="e7eaf8a6855df01307e844f022d3de8052a07bb3" />
+  <project path="prebuilts/tools" name="platform/prebuilts/tools" clone-depth="1" revision="9d1674faf578b72b2eab3ea3ff49baea0eb4b757" />
 
-  <project path="tools/adt/idea" name="platform/tools/adt/idea" revision="069104ea0ca6c5ea27cb261f7c472ba846bd4a09" />
+  <project path="tools/adt/idea" name="platform/tools/adt/idea" revision="2a130ba913279a2bdcf11f68993b8c1c1194c0f2" />
 
-  <project path="tools/analytics-library" name="platform/tools/analytics-library" revision="f3170d2c56bf064fe7c0793f3fa6f7701fa90702" />
+  <project path="tools/analytics-library" name="platform/tools/analytics-library" revision="a87c0d7b7ac6c726437923b1571d742db5de7041" />
 
-  <project path="tools/apksig" name="platform/tools/apksig" revision="c271b6a7a76165741eceee0df3f74d84455f0351" />
+  <project path="tools/apksig" name="platform/tools/apksig" revision="3a417211e8f11480be69b714309c1576d3082489" />
 
-  <project path="tools/apkzlib" name="platform/tools/apkzlib" revision="01abe9167403df3d5a29eff918ee5548257e7f76" />
+  <project path="tools/apkzlib" name="platform/tools/apkzlib" revision="f106d323effdbc8f2dc98967285f21d7c0466bf1" />
 
   <project path="tools/assets" name="assets/android-studio-ux-assets" clone-depth="1" revision="12cb5d3f886788b74450295f62da9d7517e7ba94" />
 
-  <project path="tools/base" name="platform/tools/base" revision="67653aaf673c48dcde4f31452fed9f6a4c3a75d1">
+  <project path="tools/base" name="platform/tools/base" revision="15c43c8d49bf87f5099c46a265c045c35ef675ff">
     <linkfile dest="tools/BUILD.bazel" src="bazel/tools.BUILD.bazel" />
 
     <linkfile dest="WORKSPACE" src="bazel/toplevel.WORKSPACE" />
 
     <linkfile dest=".bazelignore" src="bazel/toplevel.bazelignore" />
 
+    <linkfile dest=".bazelversion" src="bazel/toplevel.bazelversion" />
+
     <linkfile dest="prebuilts/studio/sdk/BUILD" src="bazel/sdk/prebuilts.studio.sdk.BUILD" />
 
     <linkfile dest="prebuilts/studio/sdk/README.md" src="bazel/sdk/prebuilts.studio.sdk.README.md" />
@@ -93,59 +101,59 @@
     <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="db6960f3850ca60eb825f3117c20542dd0851582" />
+  <project path="tools/data-binding" name="platform/frameworks/data-binding" revision="b4743bea1b3d7422f6441769e71a0d8abcb74029" />
 
   <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="8b3ad4b3ec1fe247742014359f4edb2b6b25d3ac" />
 
-  <project path="tools/external/gradle" name="platform/tools/external/gradle" clone-depth="1" revision="14b39c2c60585418e532711d042f125f39ee6098" />
+  <project path="tools/external/gradle" name="platform/tools/external/gradle" clone-depth="1" revision="2670eeb755e2fdb8629de4298874e68235e263dd" />
 
-  <project path="tools/gradle" name="platform/tools/gradle" revision="2d741b71a2a49a89481cb98a31d024f272014756" />
+  <project path="tools/gradle" name="platform/tools/gradle" revision="aafed0b5141395be3b705006d7b027a09c74ac9b" />
 
-  <project path="tools/gradle-recipes" name="platform/tools/gradle-recipes" revision="372c27be732a527dd8e51a53d8762a25515b4638" />
+  <project path="tools/gradle-recipes" name="platform/tools/gradle-recipes" revision="c81ed94ab7922582eee4ffb26ca0b3597e2f10d2" />
 
-  <project path="tools/idea" name="platform/tools/idea" revision="8e4c7c5fae75eac9d68b34c1bfb1cc83202a9431" />
+  <project path="tools/idea" name="platform/tools/idea" revision="dc9672b8381efb73404446f55793affd5cd2d959" />
 
-  <project path="tools/repohooks" name="platform/tools/repohooks" revision="2f20219a96e95eddb48c2fb9323fac4302858814" />
+  <project path="tools/repohooks" name="platform/tools/repohooks" revision="d427ec7d2b27b3458dbacbf1514301a93263e55c" />
 
   <project path="tools/sherpa" name="platform/frameworks/opt/sherpa" revision="c0de6383b1db33a235451a7b0f806a0b2d1fae6a" />
 
-  <project path="tools/studio/google/appindexing" name="platform/tools/studio/google/appindexing" revision="ce45360d5aa7c2bb30c64ac55f0bb5bdad05ba36" />
+  <project path="tools/studio/google/appindexing" name="platform/tools/studio/google/appindexing" revision="089ebf624b9adf64a9cfdd33fb73bff01aab9b65" />
 
-  <project path="tools/studio/google/cloud/testing" name="platform/tools/studio/google/cloud/testing" revision="ed6ddc91139b41f9d76e8104ad8ced264ae792fd" />
+  <project path="tools/studio/google/cloud/testing" name="platform/tools/studio/google/cloud/testing" revision="40031f75bdcb0e7963891313145a77695af8f5f9" />
 
-  <project path="tools/studio/google/cloud/tools" name="platform/tools/studio/google/cloud/tools" revision="469be37ddeb0ab42b83cab9cba5619a2be1d67d3" />
+  <project path="tools/studio/google/cloud/tools" name="platform/tools/studio/google/cloud/tools" revision="ab94773219cca32163f1959123bdca791a6afc97" />
 
-  <project path="tools/studio/google/samples" name="platform/tools/studio/google/samples" revision="5dde82450c5e067db17cce39b527434ae50f5bbe" />
+  <project path="tools/studio/google/samples" name="platform/tools/studio/google/samples" revision="83539ec2b2842cdda6b376fe33f4b54877e4c677" />
 
-  <project path="tools/swing-testing" name="platform/tools/swing-testing" revision="72e469633d42fc590aff80ee10a96b8076afba15" />
+  <project path="tools/swing-testing" name="platform/tools/swing-testing" revision="b942617683474c5f2e338d69014b92278ad27f95" />
 
   <project path="tools/vendor/galvsoft" name="platform/tools/vendor/galvsoft" revision="9ca8fc5c4e4de5b81ad7ee99da1a75208168a5f6" />
 
-  <project path="tools/vendor/google" name="platform/tools/vendor/google" revision="77ae1099699230fc97872d2811ccd040b79e22cc" />
+  <project path="tools/vendor/google" name="platform/tools/vendor/google" revision="d5b799ee4a93e21be86afccfd7b6b098a2c746c2" />
 
-  <project path="tools/vendor/google3/blaze" name="platform/tools/vendor/google3/blaze" revision="d940641d941651b13870d6869bf9fad39575c172" />
+  <project path="tools/vendor/google3/blaze" name="platform/tools/vendor/google3/blaze" revision="e2f436918cc6f40653af87f405302b37eee9ac45" />
 
-  <project path="tools/vendor/intel" name="platform/tools/vendor/intel" revision="fc3553f72f7797de5337e58173224537e8d9f918" />
+  <project path="tools/vendor/intel" name="platform/tools/vendor/intel" revision="1212619833f94165022ac6ba46a434d88fef37b4" />
 
-  <project path="tools/vendor/intellij/cidr" name="platform/tools/vendor/intellij/cidr" revision="798e4e46d7a891b270ed508936a11b3a54bff0d8" />
+  <project path="tools/vendor/intellij/cidr" name="platform/tools/vendor/intellij/cidr" revision="b9e99e8fe820ddc9fba388a4b18ce1ba8b19c9d2" />
 
-  <project path="tools/vendor/adt_infra_internal" name="platform/tools/adt_infra_internal" groups="adt-infra" revision="0603a7c8356185d1c41c4807d4fbc7c47f12cddf" />
+  <project path="tools/vendor/adt_infra_internal" name="platform/tools/adt_infra_internal" groups="adt-infra" revision="9088922470e8fafc23ebd62ab34272c69c5fc871" />
 
-  <project path="prebuilts/studio/buildbenchmarks" name="platform/tools/vendor/google_prebuilt/buildbenchmarks" clone-depth="1" revision="c04317fe3d595f9ff1dca7b7487cd281a233c4b2" />
+  <project path="prebuilts/studio/buildbenchmarks" name="platform/tools/vendor/google_prebuilt/buildbenchmarks" clone-depth="1" revision="880d449075a87cd698e7a59e5476885841089676" />
 
   <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="7b9fd9ecfcfcac12b3a2ff717b3da9588384bb37" />
+  <project path="prebuilts/studio/sdk/remote" name="platform/tools/google_prebuilts/studio/sdk/remote" clone-depth="1" revision="801d61d79dc17c31355b870fe6f4810e0a60aa1e" />
 
-  <project path="prebuilts/studio/intellij-sdk" name="platform/tools/vendor/google_prebuilts/studio/intellij-sdk" clone-depth="1" revision="4ca91dc37e90178a5fa5364d32a273e1331447f4" />
+  <project path="prebuilts/studio/intellij-sdk" name="platform/tools/vendor/google_prebuilts/studio/intellij-sdk" clone-depth="1" revision="8a3d9a07a0d3ca529c80d8651c3f79b04694570b" />
 
-  <project path="prebuilts/studio/sdk/darwin" name="platform/tools/vendor/google_prebuilts/studio/sdk/darwin" clone-depth="1" groups="notdefault,platform-darwin" revision="305c8eda4b71324272f0affe13ccffd4cc007158" />
+  <project path="prebuilts/studio/sdk/darwin" name="platform/tools/vendor/google_prebuilts/studio/sdk/darwin" clone-depth="1" groups="notdefault,platform-darwin" revision="b1326a885793cb39633fd272ae7cafacf73f5f5b" />
 
-  <project path="prebuilts/studio/sdk/linux" name="platform/tools/vendor/google_prebuilts/studio/sdk/linux" clone-depth="1" groups="notdefault,platform-linux" revision="bc414f104e784241a28131ce79980a0cdcdc88e9" />
+  <project path="prebuilts/studio/sdk/linux" name="platform/tools/vendor/google_prebuilts/studio/sdk/linux" clone-depth="1" groups="notdefault,platform-linux" revision="eb242fc0173384d652958f8e09ca75a5f7ee9f76" />
 
-  <project path="prebuilts/studio/sdk/windows" name="platform/tools/vendor/google_prebuilts/studio/sdk/windows" clone-depth="1" groups="notdefault,platform-windows" revision="75c2bd741ac71771fd9905396392c5fe6eed837a" />
+  <project path="prebuilts/studio/sdk/windows" name="platform/tools/vendor/google_prebuilts/studio/sdk/windows" clone-depth="1" groups="notdefault,platform-windows" revision="8b6ee029d2d953cda7c8a40f3de04053964b862f" />
 
   <repo-hooks in-project="platform/tools/repohooks" enabled-list="pre-upload" />
 </manifest>
diff --git a/patches/bin-resourceshrinker.patch b/patches/bin-resourceshrinker.patch
new file mode 100644
index 0000000..34628f7
--- /dev/null
+++ b/patches/bin-resourceshrinker.patch
@@ -0,0 +1,22 @@
+diff --git a/tools/bin/resourceshrinker b/tools/bin/resourceshrinker
+index 09d0643..0220d88 100755
+--- a/tools/bin/resourceshrinker
++++ b/tools/bin/resourceshrinker
+@@ -64,7 +64,16 @@ case "`uname`" in
+     ;;
+ esac
+ 
+-CLASSPATH=$APP_HOME/lib/resourceshrinker-classpath.jar
++#CLASSPATH=$APP_HOME/lib/resourceshrinker-classpath.jar
++
++# BEGIN ANDROID PLATFORM
++# Check ../framework/lint.jar first before falling back to ../lib/lint-classpath.jar.
++CLASSPATH=$APP_HOME/framework/resourceshrinker.jar
++if [ ! -e $CLASSPATH ]; then
++  CLASSPATH=$APP_HOME/lib//resourceshrinker-classpath.jar
++fi
++# END ANDROID PLATFORM
++
+ 
+ # Determine the Java command to use to start the JVM.
+ if [ -n "$JAVA_HOME" ] ; then
diff --git a/shrinker.xml b/shrinker.xml
new file mode 100644
index 0000000..357131b
--- /dev/null
+++ b/shrinker.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools"
+    tools:shrinkMode="strict"
+    tools:keep="@id/*"
+/>
diff --git a/tools/NOTICE.txt b/tools/NOTICE.txt
index ce2523b..8e4294a 100755
--- a/tools/NOTICE.txt
+++ b/tools/NOTICE.txt
@@ -1,10 +1,10 @@
 ============================================================
 Notices for file(s):
-kotlin-stdlib-common-1.5.31.NOTICE
-kotlin-stdlib-1.5.31.NOTICE
-kotlin-stdlib-jdk7-1.5.31.NOTICE
-kotlin-stdlib-jdk8-1.5.31.NOTICE
-kotlin-reflect-1.5.31.NOTICE
+kotlin-stdlib-common-1.7.10.NOTICE
+kotlin-stdlib-1.7.10.NOTICE
+kotlin-stdlib-jdk7-1.7.10.NOTICE
+kotlin-stdlib-jdk8-1.7.10.NOTICE
+kotlin-reflect-1.7.10.NOTICE
 ------------------------------------------------------------
 /*
  * Copyright 2010-2015 JetBrains s.r.o.
@@ -23,6 +23,97 @@ kotlin-reflect-1.5.31.NOTICE
  */
 ============================================================
 Notices for file(s):
+dexlib2-2.5.2.NOTICE
+util-2.5.2.NOTICE
+baksmali-2.5.2.NOTICE
+------------------------------------------------------------
+The majority of smali/baksmali is written and copyrighted by me (Ben Gruver)
+and released under the following license:
+
+*******************************************************************************
+Copyright (c) 2010 Ben Gruver (JesusFreke)
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. The name of the author may not be used to endorse or promote products
+   derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*******************************************************************************
+
+
+Unless otherwise stated in the code/commit message, any changes with the
+committer of bgruv@google.com or wkal@google.com is copyrighted by
+Google Inc. and released under the following license:
+
+*******************************************************************************
+Copyright 2011, Google Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+    * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*******************************************************************************
+
+
+Various portions of the code are taken from the Android Open Source Project,
+and are used in accordance with the following license:
+
+*******************************************************************************
+Copyright (C) 2007 The Android Open Source Project
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*******************************************************************************
+============================================================
+Notices for file(s):
 jakarta.activation-api-1.2.1.NOTICE
 jakarta.xml.bind-api-2.3.2.NOTICE
 txw2-2.3.2.NOTICE
@@ -69,7 +160,7 @@ IN THE SOFTWARE.
  
 ============================================================
 Notices for file(s):
-checker-qual-3.5.0.NOTICE
+checker-qual-3.12.0.NOTICE
 ------------------------------------------------------------
 Most of the Checker Framework is licensed under the GNU General Public
 License, version 2 (GPL2), with the classpath exception.  The text of this
@@ -133,19 +224,19 @@ annotations-13.0.NOTICE
 failureaccess-1.0.1.NOTICE
 listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.NOTICE
 jsr305-3.0.2.NOTICE
-error_prone_annotations-2.3.4.NOTICE
+error_prone_annotations-2.10.0.NOTICE
 j2objc-annotations-1.3.NOTICE
-guava-30.1-jre.NOTICE
-gson-2.8.6.NOTICE
+guava-31.0.1-jre.NOTICE
+gson-2.8.9.NOTICE
 jimfs-1.1.NOTICE
 commons-compress-1.20.NOTICE
 FastInfoset-1.2.16.NOTICE
-httpcore-4.4.11.NOTICE
+httpcore-4.4.15.NOTICE
 commons-logging-1.2.NOTICE
 commons-codec-1.11.NOTICE
-httpclient-4.5.9.NOTICE
+httpclient-4.5.13.NOTICE
 httpmime-4.5.6.NOTICE
-aapt2-proto-7.0.0-beta04-7396180.NOTICE
+javawriter-2.5.0.NOTICE
 ------------------------------------------------------------
 
                                  Apache License
@@ -351,6 +442,18 @@ aapt2-proto-7.0.0-beta04-7396180.NOTICE
    limitations under the License.
 ============================================================
 Notices for file(s):
+bcprov-jdk15on-1.67.NOTICE
+bcpkix-jdk15on-1.67.NOTICE
+------------------------------------------------------------
+Copyright (c) 2000 - 2021 The Legion of the Bouncy Castle Inc. (https://www.bouncycastle.org)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+============================================================
+Notices for file(s):
 javax.inject-1.NOTICE
 jcommander-1.78.NOTICE
 ------------------------------------------------------------
@@ -767,118 +870,7 @@ commons-io-2.4.NOTICE
 
 ============================================================
 Notices for file(s):
-util-2.2.4.NOTICE
-dexlib2-2.2.4.NOTICE
-baksmali-2.2.4.NOTICE
-------------------------------------------------------------
-The majority of smali/baksmali is written and copyrighted by me (Ben Gruver)
-and released under the following license:
-
-*******************************************************************************
-Copyright (c) 2010 Ben Gruver (JesusFreke)
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-3. The name of the author may not be used to endorse or promote products
-   derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*******************************************************************************
-
-
-Unless otherwise stated in the code/commit message, any changes with the
-committer of bgruv@google.com or wkal@google.com is copyrighted by 
-Google Inc. and released under the following license:
-
-*******************************************************************************
-Copyright 2011, Google Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-    * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*******************************************************************************
-
-
-Various portions of the code are taken from the Android Open Source Project,
-and are used in accordance with the following license:
-
-*******************************************************************************
-Copyright (C) 2007 The Android Open Source Project
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*******************************************************************************
-
-
-Some parts of the smalidea plugin are based on code from the IDEA project, per the
-following license
-
-*******************************************************************************
-Copyright 2000-2014 JetBrains s.r.o.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*******************************************************************************
-============================================================
-Notices for file(s):
-trove4j-1.0.20181211.NOTICE
+trove4j-1.0.20200330.NOTICE
 ------------------------------------------------------------
 		  GNU LESSER GENERAL PUBLIC LICENSE
 		       Version 2.1, February 1999
@@ -1386,7 +1378,7 @@ That's all there is to it!
 
 ============================================================
 Notices for file(s):
-protobuf-java-3.10.0.NOTICE
+protobuf-java-3.19.3.NOTICE
 ------------------------------------------------------------
 This license applies to all parts of Protocol Buffers except the following:
 
@@ -1655,18 +1647,6 @@ kotlinx-cli-jvm-0.3.1.NOTICE
    limitations under the License.
 ============================================================
 Notices for file(s):
-bcprov-jdk15on-1.56.NOTICE
-bcpkix-jdk15on-1.56.NOTICE
-------------------------------------------------------------
-Copyright (c) 2000 - 2013 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-============================================================
-Notices for file(s):
 javax.activation-1.2.0.NOTICE
 ------------------------------------------------------------
 COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)Version 1.1
@@ -1758,9 +1738,10 @@ The code released under the CDDL shall be governed by the laws of the State of C
 
 ============================================================
 Notices for file(s):
-asm-9.1.NOTICE
-asm-tree-9.1.NOTICE
-asm-analysis-9.1.NOTICE
+asm-9.2.NOTICE
+asm-tree-9.2.NOTICE
+asm-analysis-9.2.NOTICE
+asm-commons-9.2.NOTICE
 ------------------------------------------------------------
 Copyright (c) 2000-2011 INRIA, France Telecom
 All rights reserved.
diff --git a/tools/bin/resourceshrinker b/tools/bin/resourceshrinker
new file mode 100755
index 0000000..0220d88
--- /dev/null
+++ b/tools/bin/resourceshrinker
@@ -0,0 +1,181 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  resourceshrinker 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="resourceshrinker"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and RESOURCESHRINKER_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/resourceshrinker-classpath.jar
+
+# BEGIN ANDROID PLATFORM
+# Check ../framework/lint.jar first before falling back to ../lib/lint-classpath.jar.
+CLASSPATH=$APP_HOME/framework/resourceshrinker.jar
+if [ ! -e $CLASSPATH ]; then
+  CLASSPATH=$APP_HOME/lib//resourceshrinker-classpath.jar
+fi
+# END ANDROID PLATFORM
+
+
+# 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 $RESOURCESHRINKER_OPTS -classpath "\"$CLASSPATH\"" com.android.build.shrinker.ResourceShrinkerCli "$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 c35075f..8385cca 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 1038670..389ba56 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 ad77dbf..ee1fadb 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 4dadb62..a7b1e23 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 67915f3..74ed458 100755
--- a/tools/lib/apkanalyzer-classpath.jar
+++ b/tools/lib/apkanalyzer-classpath.jar
diff --git a/tools/lib/apkparser/analyzer/analyzer.jar b/tools/lib/apkparser/analyzer/analyzer.jar
index 9d02ef6..2df84e4 100755
--- a/tools/lib/apkparser/analyzer/analyzer.jar
+++ b/tools/lib/apkparser/analyzer/analyzer.jar
diff --git a/tools/lib/apkparser/cli/analyzer-cli.jar b/tools/lib/apkparser/cli/analyzer-cli.jar
index d3f75ec..fe96f7e 100755
--- a/tools/lib/apkparser/cli/analyzer-cli.jar
+++ b/tools/lib/apkparser/cli/analyzer-cli.jar
diff --git a/tools/lib/apkparser/tools.binary-resources.jar b/tools/lib/apkparser/tools.binary-resources.jar
index 436f195..412aa78 100755
--- a/tools/lib/apkparser/tools.binary-resources.jar
+++ b/tools/lib/apkparser/tools.binary-resources.jar
diff --git a/tools/lib/apkzlib/apkzlib.jar b/tools/lib/apkzlib/apkzlib.jar
new file mode 100755
index 0000000..15fe864
--- /dev/null
+++ b/tools/lib/apkzlib/apkzlib.jar
diff --git a/tools/lib/avdmanager-classpath.jar b/tools/lib/avdmanager-classpath.jar
index 1ea805a..ff46f1c 100755
--- a/tools/lib/avdmanager-classpath.jar
+++ b/tools/lib/avdmanager-classpath.jar
diff --git a/tools/lib/build-system/aapt2-proto/aapt2-proto.jar b/tools/lib/build-system/aapt2-proto/aapt2-proto.jar
new file mode 100755
index 0000000..d96103a
--- /dev/null
+++ b/tools/lib/build-system/aapt2-proto/aapt2-proto.jar
diff --git a/tools/lib/build-system/builder-model/builder-model.jar b/tools/lib/build-system/builder-model/builder-model.jar
index dacf3ce..f1d5782 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/builder-test-api/tools.builder-test-api.jar b/tools/lib/build-system/builder-test-api/tools.builder-test-api.jar
new file mode 100755
index 0000000..39f97e4
--- /dev/null
+++ b/tools/lib/build-system/builder-test-api/tools.builder-test-api.jar
diff --git a/tools/lib/build-system/builder/libbuilder.jar b/tools/lib/build-system/builder/libbuilder.jar
new file mode 100755
index 0000000..c145ccc
--- /dev/null
+++ b/tools/lib/build-system/builder/libbuilder.jar
diff --git a/tools/lib/build-system/profile/libprofile.jar b/tools/lib/build-system/profile/libprofile.jar
new file mode 100755
index 0000000..105c231
--- /dev/null
+++ b/tools/lib/build-system/profile/libprofile.jar
diff --git a/tools/lib/build-system/shrinker/libshrinker.jar b/tools/lib/build-system/shrinker/libshrinker.jar
new file mode 100755
index 0000000..08a0352
--- /dev/null
+++ b/tools/lib/build-system/shrinker/libshrinker.jar
diff --git a/tools/lib/build-system/tools.apksig.jar b/tools/lib/build-system/tools.apksig.jar
new file mode 100755
index 0000000..7f21c2c
--- /dev/null
+++ b/tools/lib/build-system/tools.apksig.jar
diff --git a/tools/lib/build-system/tools.manifest-merger.jar b/tools/lib/build-system/tools.manifest-merger.jar
index ae1eaba..4fd7421 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 87e20f6..8951f2b 100755
--- a/tools/lib/common/tools.common.jar
+++ b/tools/lib/common/tools.common.jar
diff --git a/tools/lib/ddmlib/tools.ddmlib.jar b/tools/lib/ddmlib/tools.ddmlib.jar
index 40e3d8a..90b6e6a 100755
--- a/tools/lib/ddmlib/tools.ddmlib.jar
+++ b/tools/lib/ddmlib/tools.ddmlib.jar
diff --git a/tools/lib/device_validator/tools.dvlib.jar b/tools/lib/device_validator/tools.dvlib.jar
index 5cf4e42..ce2bf99 100755
--- a/tools/lib/device_validator/tools.dvlib.jar
+++ b/tools/lib/device_validator/tools.dvlib.jar
diff --git a/tools/lib/external/com/android/tools/build/aapt2-proto/7.0.0-beta04-7396180/aapt2-proto-7.0.0-beta04-7396180.jar b/tools/lib/external/com/android/tools/build/aapt2-proto/7.0.0-beta04-7396180/aapt2-proto-7.0.0-beta04-7396180.jar
deleted file mode 100755
index f9f874b..0000000
--- a/tools/lib/external/com/android/tools/build/aapt2-proto/7.0.0-beta04-7396180/aapt2-proto-7.0.0-beta04-7396180.jar
+++ /dev/null
diff --git a/tools/lib/external/com/google/code/gson/gson/2.8.6/gson-2.8.6.jar b/tools/lib/external/com/google/code/gson/gson/2.8.6/gson-2.8.6.jar
deleted file mode 100755
index 4765c4a..0000000
--- a/tools/lib/external/com/google/code/gson/gson/2.8.6/gson-2.8.6.jar
+++ /dev/null
diff --git a/tools/lib/external/com/google/code/gson/gson/2.8.9/gson-2.8.9.jar b/tools/lib/external/com/google/code/gson/gson/2.8.9/gson-2.8.9.jar
new file mode 100755
index 0000000..3351867
--- /dev/null
+++ b/tools/lib/external/com/google/code/gson/gson/2.8.9/gson-2.8.9.jar
diff --git a/tools/lib/external/com/google/errorprone/error_prone_annotations/2.10.0/error_prone_annotations-2.10.0.jar b/tools/lib/external/com/google/errorprone/error_prone_annotations/2.10.0/error_prone_annotations-2.10.0.jar
new file mode 100755
index 0000000..2d1b543
--- /dev/null
+++ b/tools/lib/external/com/google/errorprone/error_prone_annotations/2.10.0/error_prone_annotations-2.10.0.jar
diff --git a/tools/lib/external/com/google/errorprone/error_prone_annotations/2.3.4/error_prone_annotations-2.3.4.jar b/tools/lib/external/com/google/errorprone/error_prone_annotations/2.3.4/error_prone_annotations-2.3.4.jar
deleted file mode 100755
index c9bea2a..0000000
--- a/tools/lib/external/com/google/errorprone/error_prone_annotations/2.3.4/error_prone_annotations-2.3.4.jar
+++ /dev/null
diff --git a/tools/lib/external/com/google/guava/guava/30.1-jre/guava-30.1-jre.jar b/tools/lib/external/com/google/guava/guava/30.1-jre/guava-30.1-jre.jar
deleted file mode 100755
index 4244e8a..0000000
--- a/tools/lib/external/com/google/guava/guava/30.1-jre/guava-30.1-jre.jar
+++ /dev/null
diff --git a/tools/lib/external/com/google/guava/guava/31.0.1-jre/guava-31.0.1-jre.jar b/tools/lib/external/com/google/guava/guava/31.0.1-jre/guava-31.0.1-jre.jar
new file mode 100755
index 0000000..324887d
--- /dev/null
+++ b/tools/lib/external/com/google/guava/guava/31.0.1-jre/guava-31.0.1-jre.jar
diff --git a/tools/lib/external/com/google/protobuf/protobuf-java/3.10.0/protobuf-java-3.10.0.jar b/tools/lib/external/com/google/protobuf/protobuf-java/3.10.0/protobuf-java-3.10.0.jar
deleted file mode 100755
index 93c07a0..0000000
--- a/tools/lib/external/com/google/protobuf/protobuf-java/3.10.0/protobuf-java-3.10.0.jar
+++ /dev/null
diff --git a/tools/lib/external/com/google/protobuf/protobuf-java/3.19.3/protobuf-java-3.19.3.jar b/tools/lib/external/com/google/protobuf/protobuf-java/3.19.3/protobuf-java-3.19.3.jar
new file mode 100755
index 0000000..e23484c
--- /dev/null
+++ b/tools/lib/external/com/google/protobuf/protobuf-java/3.19.3/protobuf-java-3.19.3.jar
diff --git a/tools/lib/external/com/squareup/javawriter/2.5.0/javawriter-2.5.0.jar b/tools/lib/external/com/squareup/javawriter/2.5.0/javawriter-2.5.0.jar
new file mode 100755
index 0000000..74b4382
--- /dev/null
+++ b/tools/lib/external/com/squareup/javawriter/2.5.0/javawriter-2.5.0.jar
diff --git a/tools/lib/external/lint-psi/intellij-core/intellij-core-mvn.jar b/tools/lib/external/lint-psi/intellij-core/intellij-core-mvn.jar
index d6a5c25..941c521 100755
--- a/tools/lib/external/lint-psi/intellij-core/intellij-core-mvn.jar
+++ b/tools/lib/external/lint-psi/intellij-core/intellij-core-mvn.jar
diff --git a/tools/lib/external/lint-psi/kotlin-compiler/kotlin-compiler-mvn.jar b/tools/lib/external/lint-psi/kotlin-compiler/kotlin-compiler-mvn.jar
index 4f35313..359bd0c 100755
--- a/tools/lib/external/lint-psi/kotlin-compiler/kotlin-compiler-mvn.jar
+++ b/tools/lib/external/lint-psi/kotlin-compiler/kotlin-compiler-mvn.jar
diff --git a/tools/lib/external/lint-psi/uast/uast.jar b/tools/lib/external/lint-psi/uast/uast.jar
index 1d442d2..828111d 100755
--- a/tools/lib/external/lint-psi/uast/uast.jar
+++ b/tools/lib/external/lint-psi/uast/uast.jar
diff --git a/tools/lib/external/org/apache/httpcomponents/httpclient/4.5.9/httpclient-4.5.9.jar b/tools/lib/external/org/apache/httpcomponents/httpclient/4.5.13/httpclient-4.5.13.jar
index 83bc29d..218ee25 100755
--- a/tools/lib/external/org/apache/httpcomponents/httpclient/4.5.9/httpclient-4.5.9.jar
+++ b/tools/lib/external/org/apache/httpcomponents/httpclient/4.5.13/httpclient-4.5.13.jar
diff --git a/tools/lib/external/org/apache/httpcomponents/httpcore/4.4.11/httpcore-4.4.11.jar b/tools/lib/external/org/apache/httpcomponents/httpcore/4.4.15/httpcore-4.4.15.jar
index c31d401..dc4b9fc 100755
--- a/tools/lib/external/org/apache/httpcomponents/httpcore/4.4.11/httpcore-4.4.11.jar
+++ b/tools/lib/external/org/apache/httpcomponents/httpcore/4.4.15/httpcore-4.4.15.jar
diff --git a/tools/lib/external/org/bouncycastle/bcpkix-jdk15on/1.56/bcpkix-jdk15on-1.56.jar b/tools/lib/external/org/bouncycastle/bcpkix-jdk15on/1.56/bcpkix-jdk15on-1.56.jar
deleted file mode 100755
index 88bb1ce..0000000
--- a/tools/lib/external/org/bouncycastle/bcpkix-jdk15on/1.56/bcpkix-jdk15on-1.56.jar
+++ /dev/null
diff --git a/tools/lib/external/org/bouncycastle/bcpkix-jdk15on/1.67/bcpkix-jdk15on-1.67.jar b/tools/lib/external/org/bouncycastle/bcpkix-jdk15on/1.67/bcpkix-jdk15on-1.67.jar
new file mode 100755
index 0000000..402d108
--- /dev/null
+++ b/tools/lib/external/org/bouncycastle/bcpkix-jdk15on/1.67/bcpkix-jdk15on-1.67.jar
diff --git a/tools/lib/external/org/bouncycastle/bcprov-jdk15on/1.56/bcprov-jdk15on-1.56.jar b/tools/lib/external/org/bouncycastle/bcprov-jdk15on/1.56/bcprov-jdk15on-1.56.jar
deleted file mode 100755
index ffd08d6..0000000
--- a/tools/lib/external/org/bouncycastle/bcprov-jdk15on/1.56/bcprov-jdk15on-1.56.jar
+++ /dev/null
diff --git a/tools/lib/external/org/bouncycastle/bcprov-jdk15on/1.67/bcprov-jdk15on-1.67.jar b/tools/lib/external/org/bouncycastle/bcprov-jdk15on/1.67/bcprov-jdk15on-1.67.jar
new file mode 100755
index 0000000..94aae29
--- /dev/null
+++ b/tools/lib/external/org/bouncycastle/bcprov-jdk15on/1.67/bcprov-jdk15on-1.67.jar
diff --git a/tools/lib/external/org/checkerframework/checker-qual/3.5.0/checker-qual-3.5.0.jar b/tools/lib/external/org/checkerframework/checker-qual/3.12.0/checker-qual-3.12.0.jar
index f98cde8..e9eed80 100755
--- a/tools/lib/external/org/checkerframework/checker-qual/3.5.0/checker-qual-3.5.0.jar
+++ b/tools/lib/external/org/checkerframework/checker-qual/3.12.0/checker-qual-3.12.0.jar
diff --git a/tools/lib/external/org/jetbrains/intellij/deps/trove4j/1.0.20181211/trove4j-1.0.20181211.jar b/tools/lib/external/org/jetbrains/intellij/deps/trove4j/1.0.20200330/trove4j-1.0.20200330.jar
index 2c6d9ff..0b174bf 100755
--- a/tools/lib/external/org/jetbrains/intellij/deps/trove4j/1.0.20181211/trove4j-1.0.20181211.jar
+++ b/tools/lib/external/org/jetbrains/intellij/deps/trove4j/1.0.20200330/trove4j-1.0.20200330.jar
diff --git a/tools/lib/external/org/jetbrains/kotlin/kotlin-reflect/1.5.31/kotlin-reflect-1.5.31.jar b/tools/lib/external/org/jetbrains/kotlin/kotlin-reflect/1.5.31/kotlin-reflect-1.5.31.jar
deleted file mode 100755
index a7a3cc5..0000000
--- a/tools/lib/external/org/jetbrains/kotlin/kotlin-reflect/1.5.31/kotlin-reflect-1.5.31.jar
+++ /dev/null
diff --git a/tools/lib/external/org/jetbrains/kotlin/kotlin-reflect/1.7.10/kotlin-reflect-1.7.10.jar b/tools/lib/external/org/jetbrains/kotlin/kotlin-reflect/1.7.10/kotlin-reflect-1.7.10.jar
new file mode 100755
index 0000000..fd3fd38
--- /dev/null
+++ b/tools/lib/external/org/jetbrains/kotlin/kotlin-reflect/1.7.10/kotlin-reflect-1.7.10.jar
diff --git a/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib-common/1.5.31/kotlin-stdlib-common-1.5.31.jar b/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib-common/1.7.10/kotlin-stdlib-common-1.7.10.jar
index d699d0d..3c2b91d 100755
--- a/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib-common/1.5.31/kotlin-stdlib-common-1.5.31.jar
+++ b/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib-common/1.7.10/kotlin-stdlib-common-1.7.10.jar
diff --git a/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.5.31/kotlin-stdlib-jdk7-1.5.31.jar b/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.5.31/kotlin-stdlib-jdk7-1.5.31.jar
deleted file mode 100755
index ce217db..0000000
--- a/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.5.31/kotlin-stdlib-jdk7-1.5.31.jar
+++ /dev/null
diff --git a/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.7.10/kotlin-stdlib-jdk7-1.7.10.jar b/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.7.10/kotlin-stdlib-jdk7-1.7.10.jar
new file mode 100755
index 0000000..149f57a
--- /dev/null
+++ b/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.7.10/kotlin-stdlib-jdk7-1.7.10.jar
diff --git a/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.5.31/kotlin-stdlib-jdk8-1.5.31.jar b/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.5.31/kotlin-stdlib-jdk8-1.5.31.jar
deleted file mode 100755
index 661b661..0000000
--- a/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.5.31/kotlin-stdlib-jdk8-1.5.31.jar
+++ /dev/null
diff --git a/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.7.10/kotlin-stdlib-jdk8-1.7.10.jar b/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.7.10/kotlin-stdlib-jdk8-1.7.10.jar
new file mode 100755
index 0000000..96fcdaf
--- /dev/null
+++ b/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.7.10/kotlin-stdlib-jdk8-1.7.10.jar
diff --git a/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib/1.5.31/kotlin-stdlib-1.5.31.jar b/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib/1.5.31/kotlin-stdlib-1.5.31.jar
deleted file mode 100755
index 24f72dc..0000000
--- a/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib/1.5.31/kotlin-stdlib-1.5.31.jar
+++ /dev/null
diff --git a/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib/1.7.10/kotlin-stdlib-1.7.10.jar b/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib/1.7.10/kotlin-stdlib-1.7.10.jar
new file mode 100755
index 0000000..1cd9e7c
--- /dev/null
+++ b/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib/1.7.10/kotlin-stdlib-1.7.10.jar
diff --git a/tools/lib/external/org/ow2/asm/asm-analysis/9.1/asm-analysis-9.1.jar b/tools/lib/external/org/ow2/asm/asm-analysis/9.2/asm-analysis-9.2.jar
index f97d124..9d575ca 100755
--- a/tools/lib/external/org/ow2/asm/asm-analysis/9.1/asm-analysis-9.1.jar
+++ b/tools/lib/external/org/ow2/asm/asm-analysis/9.2/asm-analysis-9.2.jar
diff --git a/tools/lib/external/org/ow2/asm/asm-commons/9.2/asm-commons-9.2.jar b/tools/lib/external/org/ow2/asm/asm-commons/9.2/asm-commons-9.2.jar
new file mode 100755
index 0000000..01028a0
--- /dev/null
+++ b/tools/lib/external/org/ow2/asm/asm-commons/9.2/asm-commons-9.2.jar
diff --git a/tools/lib/external/org/ow2/asm/asm-tree/9.1/asm-tree-9.1.jar b/tools/lib/external/org/ow2/asm/asm-tree/9.2/asm-tree-9.2.jar
index 0375862..0a6833a 100755
--- a/tools/lib/external/org/ow2/asm/asm-tree/9.1/asm-tree-9.1.jar
+++ b/tools/lib/external/org/ow2/asm/asm-tree/9.2/asm-tree-9.2.jar
diff --git a/tools/lib/external/org/ow2/asm/asm/9.1/asm-9.1.jar b/tools/lib/external/org/ow2/asm/asm/9.2/asm-9.2.jar
index 8238019..3557ae4 100755
--- a/tools/lib/external/org/ow2/asm/asm/9.1/asm-9.1.jar
+++ b/tools/lib/external/org/ow2/asm/asm/9.2/asm-9.2.jar
diff --git a/tools/lib/external/org/smali/baksmali/2.2.4/baksmali-2.2.4.jar b/tools/lib/external/org/smali/baksmali/2.2.4/baksmali-2.2.4.jar
deleted file mode 100755
index eec3fbb..0000000
--- a/tools/lib/external/org/smali/baksmali/2.2.4/baksmali-2.2.4.jar
+++ /dev/null
diff --git a/tools/lib/external/org/smali/baksmali/2.5.2/baksmali-2.5.2.jar b/tools/lib/external/org/smali/baksmali/2.5.2/baksmali-2.5.2.jar
new file mode 100755
index 0000000..bd686f3
--- /dev/null
+++ b/tools/lib/external/org/smali/baksmali/2.5.2/baksmali-2.5.2.jar
diff --git a/tools/lib/external/org/smali/dexlib2/2.2.4/dexlib2-2.2.4.jar b/tools/lib/external/org/smali/dexlib2/2.2.4/dexlib2-2.2.4.jar
deleted file mode 100755
index 30368c4..0000000
--- a/tools/lib/external/org/smali/dexlib2/2.2.4/dexlib2-2.2.4.jar
+++ /dev/null
diff --git a/tools/lib/external/org/smali/dexlib2/2.5.2/dexlib2-2.5.2.jar b/tools/lib/external/org/smali/dexlib2/2.5.2/dexlib2-2.5.2.jar
new file mode 100755
index 0000000..392b3fc
--- /dev/null
+++ b/tools/lib/external/org/smali/dexlib2/2.5.2/dexlib2-2.5.2.jar
diff --git a/tools/lib/external/org/smali/util/2.2.4/util-2.2.4.jar b/tools/lib/external/org/smali/util/2.2.4/util-2.2.4.jar
deleted file mode 100755
index 0d538d5..0000000
--- a/tools/lib/external/org/smali/util/2.2.4/util-2.2.4.jar
+++ /dev/null
diff --git a/tools/lib/external/org/smali/util/2.5.2/util-2.5.2.jar b/tools/lib/external/org/smali/util/2.5.2/util-2.5.2.jar
new file mode 100755
index 0000000..51e993e
--- /dev/null
+++ b/tools/lib/external/org/smali/util/2.5.2/util-2.5.2.jar
diff --git a/tools/lib/layoutlib-api/tools.layoutlib-api.jar b/tools/lib/layoutlib-api/tools.layoutlib-api.jar
index 3cd68d2..460312e 100755
--- a/tools/lib/layoutlib-api/tools.layoutlib-api.jar
+++ b/tools/lib/layoutlib-api/tools.layoutlib-api.jar
diff --git a/tools/lib/lint-classpath.jar b/tools/lib/lint-classpath.jar
index a7a198b..4887b86 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 264c8d4..b5ab2b5 100755
--- a/tools/lib/lint/cli/cli.jar
+++ b/tools/lib/lint/cli/cli.jar
diff --git a/tools/lib/lint/lint-checks-proto.jar b/tools/lib/lint/lint-checks-proto.jar
new file mode 100755
index 0000000..725fd33
--- /dev/null
+++ b/tools/lib/lint/lint-checks-proto.jar
diff --git a/tools/lib/lint/tools.lint-api.jar b/tools/lib/lint/tools.lint-api.jar
index b423b2d..aec5772 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 b909193..afcd6f2 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 324f5df..74db60c 100755
--- a/tools/lib/lint/tools.lint-model.jar
+++ b/tools/lib/lint/tools.lint-model.jar
diff --git a/tools/lib/misc/screenshot2/libscreenshot2lib.jar b/tools/lib/misc/screenshot2/libscreenshot2lib.jar
index cb479ed..f20dc76 100755
--- a/tools/lib/misc/screenshot2/libscreenshot2lib.jar
+++ b/tools/lib/misc/screenshot2/libscreenshot2lib.jar
diff --git a/tools/lib/profgen-classpath.jar b/tools/lib/profgen-classpath.jar
index 93ac62f..e5eb22f 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 deb80d4..70ddf90 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 b7ba94e..ecbbde8 100755
--- a/tools/lib/profgen/profgen/libprofgen.jar
+++ b/tools/lib/profgen/profgen/libprofgen.jar
diff --git a/tools/lib/r8.jar b/tools/lib/r8.jar
index c69bec6..bb1a634 100755
--- a/tools/lib/r8.jar
+++ b/tools/lib/r8.jar
diff --git a/tools/lib/repository/tools.repository.jar b/tools/lib/repository/tools.repository.jar
index 91c006e..f2b85c2 100755
--- a/tools/lib/repository/tools.repository.jar
+++ b/tools/lib/repository/tools.repository.jar
diff --git a/tools/lib/resourceshrinker-classpath.jar b/tools/lib/resourceshrinker-classpath.jar
new file mode 100755
index 0000000..111de31
--- /dev/null
+++ b/tools/lib/resourceshrinker-classpath.jar
diff --git a/tools/lib/retrace-classpath.jar b/tools/lib/retrace-classpath.jar
index 7ec0306..bbcd7b6 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 8716b16..17c93ff 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 f3594d3..9f4bedd 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/libavdmanager_lib.jar b/tools/lib/sdklib/libavdmanager_lib.jar
index 474cf65..6d3e663 100755
--- a/tools/lib/sdklib/libavdmanager_lib.jar
+++ b/tools/lib/sdklib/libavdmanager_lib.jar
diff --git a/tools/lib/sdklib/libsdkmanager_lib.jar b/tools/lib/sdklib/libsdkmanager_lib.jar
index e274456..2a3ef2c 100755
--- a/tools/lib/sdklib/libsdkmanager_lib.jar
+++ b/tools/lib/sdklib/libsdkmanager_lib.jar
diff --git a/tools/lib/sdklib/sdklib.core.jar b/tools/lib/sdklib/sdklib.core.jar
index f912f8c..c6655e1 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 417c8a5..f70f02a 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 b22999b..c36feb0 100755
--- a/tools/lib/sdkmanager-classpath.jar
+++ b/tools/lib/sdkmanager-classpath.jar
diff --git a/tools/lib/signflinger/signflinger.jar b/tools/lib/signflinger/signflinger.jar
new file mode 100755
index 0000000..beba1ec
--- /dev/null
+++ b/tools/lib/signflinger/signflinger.jar
diff --git a/tools/lib/zipflinger/zipflinger.jar b/tools/lib/zipflinger/zipflinger.jar
new file mode 100755
index 0000000..56fd97b
--- /dev/null
+++ b/tools/lib/zipflinger/zipflinger.jar
diff --git a/tools/source.properties b/tools/source.properties
index 52fcab7..760cb12 100755
--- a/tools/source.properties
+++ b/tools/source.properties
@@ -1,3 +1,3 @@
-Pkg.Revision=3.0-dev
-Pkg.Path=cmdline-tools;3.0-dev
+Pkg.Revision=11.0-dev
+Pkg.Path=cmdline-tools;11.0-dev
 Pkg.Desc=Android SDK Command-line Tools
diff --git a/update-android-global-lint-checker.sh b/update-android-global-lint-checker.sh
new file mode 100755
index 0000000..1882dce
--- /dev/null
+++ b/update-android-global-lint-checker.sh
@@ -0,0 +1,41 @@
+#!/bin/bash -e
+
+# Copyright 2022 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+if [ -z $1 ]; then
+    echo "usage: $0 <build number>"
+    exit 1
+fi
+
+readonly BUILD_NUMBER=$1
+
+cd "$(dirname $0)"
+
+if ! git diff HEAD --quiet; then
+    echo "must be run with a clean prebuilts/build-tools project"
+    exit 1
+fi
+
+/google/data/ro/projects/android/fetch_artifact \
+  --bid ${BUILD_NUMBER} \
+  --target aosp_arm64-userdebug \
+  AndroidGlobalLintChecker.jar
+
+git add AndroidGlobalLintChecker.jar
+git commit -m "Update AndroidGlobalLintChecker to ab/${BUILD_NUMBER}
+
+https://ci.android.com/builds/submitted/${BUILD_NUMBER}/aosp_arm64-userdebug/latest
+
+Test: treehugger"
diff --git a/update-prebuilts.sh b/update-prebuilts.sh
index 4fc0fa2..de694cc 100755
--- a/update-prebuilts.sh
+++ b/update-prebuilts.sh
@@ -59,6 +59,7 @@ cp -f "${tmpdir}/lint-tests.jar" lint-tests.jar
 cp -f "${tmpdir}/manifest.xml" manifest.xml
 
 patch -p1 < patches/bin-lint.patch
+patch -p1 < patches/bin-resourceshrinker.patch
 
 git add tools lint-tests.jar manifest.xml
 git commit -m "Update cmdline-tools to ab/${BUILD_NUMBER}