Update cmdline-tools to ab/7748865
https://ci.android.com/builds/submitted/7748865/studio-linux/latest
Test: treehugger
Change-Id: I12a42f831c2184557f06368e71393f0896c10655
diff --git a/lint-tests.jar b/lint-tests.jar
new file mode 100644
index 0000000..b414695
--- /dev/null
+++ b/lint-tests.jar
Binary files differ
diff --git a/manifest.xml b/manifest.xml
new file mode 100644
index 0000000..354f252
--- /dev/null
+++ b/manifest.xml
@@ -0,0 +1,151 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<manifest>
+ <remote name="goog" fetch="https://googleplex-android.googlesource.com/" review="https://googleplex-android.googlesource.com/" />
+
+ <default revision="studio-main" remote="goog" sync-c="true" />
+
+ <superproject name="platform/superproject" remote="goog" />
+
+ <project path="tools/buildSrc" name="platform/tools/buildSrc" revision="c1ae6b9e38cc9a5522afbdbc33846b3da5024db0">
+ <linkfile dest="tools/build.xml" src="base/build.xml" />
+
+ <linkfile dest="tools/build.gradle" src="base/build.gradle" />
+
+ <linkfile dest="tools/gradle.properties" src="base/gradle.properties" />
+
+ <copyfile dest="tools/settings.gradle" src="base/settings.gradle" />
+
+ <copyfile dest="tools/gradlew" src="base/gradlew" />
+
+ <copyfile dest="tools/gradlew.bat" src="base/gradlew.bat" />
+</project>
+
+ <project path="external/dexter" name="platform/tools/dexter" revision="50fc2037daf146e5e84de1c0570268ebdc274f26" />
+
+ <project path="external/doclava" name="platform/external/doclava" revision="8844864238682f0bc658ff2c18d552f804d24f91" />
+
+ <project path="external/dokka" name="platform/external/dokka" groups="pdk" clone-depth="1" revision="1561cf03a908b651be77ab3adc54d8672bb7d852" />
+
+ <project path="external/freetype" name="platform/external/freetype" revision="93615c094b6b7a87b751916f79fe8849477d7ca8" upstream="qt-release" />
+
+ <project path="external/gflags" name="platform/external/gflags" revision="b894dbe85731174ff1b654e858eea3a0978d73b9" />
+
+ <project path="external/googletest" name="platform/external/googletest" revision="e87584ebb141cd532f4688556835903c44563292" />
+
+ <project path="external/grpc-grpc" name="platform/external/grpc-grpc" revision="fcecb51d25341dc00a016f42da3e442741d259ae" />
+
+ <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" />
+
+ <project path="external/perfetto" name="platform/external/perfetto" revision="31155364cd4e79d09c92df884510e149ca67df5e" />
+
+ <project path="external/protobuf" name="platform/external/protobuf" revision="98500ad15567e0666d4eb3b371da0b10365bb66e" />
+
+ <project path="external/skia" name="platform/external/skia" revision="dedadf9a364fc95ad0a2c5f2ea4e2802d0619a5f" 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="521f5d638c2f30d132001ada2e38a3dca8af1d64" upstream="sc-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/linux-x86" name="platform/prebuilts/clang/host/linux-x86" clone-depth="1" groups="notdefault,platform-linux" revision="b86a4fd3b59b190985730d726f1aa07ad08a8e22" />
+
+ <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/python/darwin-x86" name="platform/prebuilts/python/darwin-x86" clone-depth="1" revision="01be9bb831d99df34af08c50aad01c1b68d6c266" />
+
+ <project path="prebuilts/python/linux-x86" name="platform/prebuilts/python/linux-x86" clone-depth="1" revision="07f178f3d0fe8c47bcafbb95f0ef46a226b0abeb" />
+
+ <project path="prebuilts/python/windows-x86" name="platform/prebuilts/python/windows-x86" clone-depth="1" revision="ae5977f952ff699c34cd73a482a0c23891638789" />
+
+ <project path="prebuilts/r8" name="platform/prebuilts/r8" clone-depth="1" revision="5eb4ec33fb894ca40ee5691c7d4c3d14eda6fcaa" />
+
+ <project path="prebuilts/studio/jdk" name="platform/prebuilts/studio/jdk" clone-depth="1" revision="c8f7d79a25a5df12a12f68b858b9f5e26bdd230c" />
+
+ <project path="prebuilts/studio/layoutlib" name="platform/prebuilts/studio/layoutlib" clone-depth="1" revision="d4dfbdca973316ec96467f96859a8efe2d9653bf" />
+
+ <project path="prebuilts/tools" name="platform/prebuilts/tools" clone-depth="1" revision="4775559e5df142fff8b01088b666d02bb473966a" />
+
+ <project path="tools/adt/idea" name="platform/tools/adt/idea" revision="dc9dd1399bb08b1ecb7926a51fcaf9b577b7e120" />
+
+ <project path="tools/analytics-library" name="platform/tools/analytics-library" revision="455a40f2142144b477bc62458fd19b09d9764480" />
+
+ <project path="tools/apksig" name="platform/tools/apksig" revision="f7d2fe5ffa0f456f0eeb85ab96964370c68974ea" />
+
+ <project path="tools/apkzlib" name="platform/tools/apkzlib" revision="b335bb07165397ad7b244aca612fc415b55648a3" />
+
+ <project path="tools/assets" name="assets/android-studio-ux-assets" clone-depth="1" revision="12cb5d3f886788b74450295f62da9d7517e7ba94" />
+
+ <project path="tools/base" name="platform/tools/base" revision="001c27bbb07093985adc5cf55449b8eeec1cc442">
+ <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="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" />
+
+ <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="8b3efeafed463370e2abbf76afe2bda59569c314" />
+
+ <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="f30bc0c441874e52aee5f4802a9006795f11c820" />
+
+ <project path="tools/gradle" name="platform/tools/gradle" revision="21e2cd20c6cb84ff41596c95e6081d3429913158" />
+
+ <project path="tools/gradle-recipes" name="platform/tools/gradle-recipes" revision="372c27be732a527dd8e51a53d8762a25515b4638" />
+
+ <project path="tools/idea" name="platform/tools/idea" revision="637cfb1bc0ff32f28bc26c01f614d88637989bc7" />
+
+ <project path="tools/repohooks" name="platform/tools/repohooks" revision="2f20219a96e95eddb48c2fb9323fac4302858814" />
+
+ <project path="tools/sherpa" name="platform/frameworks/opt/sherpa" revision="c0de6383b1db33a235451a7b0f806a0b2d1fae6a" />
+
+ <project path="tools/studio/google/appindexing" name="platform/tools/studio/google/appindexing" revision="59b906078160c6f8e2b901e7e1132fa2f7dc3153" />
+
+ <project path="tools/studio/google/cloud/testing" name="platform/tools/studio/google/cloud/testing" revision="dd36d6b2323e604b99632b00d12c7ff83380a265" />
+
+ <project path="tools/studio/google/cloud/tools" name="platform/tools/studio/google/cloud/tools" revision="2db0e88a29d904f2fc99858f961a7164f122a6e4" />
+
+ <project path="tools/studio/google/samples" name="platform/tools/studio/google/samples" revision="44512f050a17b08d9756eed05d29b26575ac2b96" />
+
+ <project path="tools/swing-testing" name="platform/tools/swing-testing" revision="72e469633d42fc590aff80ee10a96b8076afba15" />
+
+ <project path="tools/vendor/galvsoft" name="platform/tools/vendor/galvsoft" revision="9ca8fc5c4e4de5b81ad7ee99da1a75208168a5f6" />
+
+ <project path="tools/vendor/google" name="platform/tools/vendor/google" revision="a2f19e1f443ad7703903924c11083d99c5c007a9" />
+
+ <project path="tools/vendor/google3/blaze" name="platform/tools/vendor/google3/blaze" revision="0684b33a00630242c002bafcef7a65090ee0b3b1" />
+
+ <project path="tools/vendor/intel" name="platform/tools/vendor/intel" revision="fc3553f72f7797de5337e58173224537e8d9f918" />
+
+ <project path="tools/vendor/intellij/cidr" name="platform/tools/vendor/intellij/cidr" revision="6afcefd6429608cb7df5a3e323d4ec14973e0dea" />
+
+ <project path="tools/vendor/adt_infra_internal" name="platform/tools/adt_infra_internal" groups="adt-infra" revision="254731225ae457e7d187491b600323ba8c892cd7" />
+
+ <project path="prebuilts/studio/buildbenchmarks" name="platform/tools/vendor/google_prebuilt/buildbenchmarks" clone-depth="1" revision="535968f996c90e1bda6656624088ba1f19437c19" />
+
+ <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/intellij-sdk" name="platform/tools/vendor/google_prebuilts/studio/intellij-sdk" clone-depth="1" revision="a560e3949f79de449b2eb4d8983e8752bc944f01" />
+
+ <project path="prebuilts/studio/sdk/darwin" name="platform/tools/vendor/google_prebuilts/studio/sdk/darwin" clone-depth="1" groups="notdefault,platform-darwin" revision="fad0746918d2202baa5f926770993e1ac149372a" />
+
+ <project path="prebuilts/studio/sdk/linux" name="platform/tools/vendor/google_prebuilts/studio/sdk/linux" clone-depth="1" groups="notdefault,platform-linux" revision="da7f0b72949f4f4564e5981a1301f20cbf3decf1" />
+
+ <project path="prebuilts/studio/sdk/windows" name="platform/tools/vendor/google_prebuilts/studio/sdk/windows" clone-depth="1" groups="notdefault,platform-windows" revision="227d7ee904bccae67190ba7f1942ed03977389cd" />
+
+ <repo-hooks in-project="platform/tools/repohooks" enabled-list="pre-upload" />
+</manifest>
diff --git a/tools/NOTICE.txt b/tools/NOTICE.txt
index 68a4aa6..8cf9d1b 100755
--- a/tools/NOTICE.txt
+++ b/tools/NOTICE.txt
@@ -25,8 +25,8 @@
Notices for file(s):
jakarta.activation-api-1.2.1.NOTICE
jakarta.xml.bind-api-2.3.2.NOTICE
-istack-commons-runtime-3.0.8.NOTICE
txw2-2.3.2.NOTICE
+istack-commons-runtime-3.0.8.NOTICE
stax-ex-1.8.1.NOTICE
jaxb-runtime-2.3.2.NOTICE
------------------------------------------------------------
@@ -127,25 +127,25 @@
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):
-jsr305-3.0.2.NOTICE
-error_prone_annotations-2.3.4.NOTICE
+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
j2objc-annotations-1.3.NOTICE
guava-30.1-jre.NOTICE
-annotations-13.0.NOTICE
gson-2.8.6.NOTICE
+commons-compress-1.20.NOTICE
+httpcore-4.4.11.NOTICE
+commons-logging-1.2.NOTICE
+commons-codec-1.11.NOTICE
+httpclient-4.5.9.NOTICE
+httpmime-4.5.6.NOTICE
+FastInfoset-1.2.16.NOTICE
jna-5.6.0.NOTICE
jna-platform-5.6.0.NOTICE
-commons-compress-1.20.NOTICE
-FastInfoset-1.2.16.NOTICE
-commons-logging-1.2.NOTICE
-commons-codec-1.10.NOTICE
-httpcore-4.4.10.NOTICE
-httpclient-4.5.6.NOTICE
-aapt2-proto-4.1.0-alpha01-6193524.NOTICE
-intellij-core-all.NOTICE
-uast-all.NOTICE
+jimfs-1.1.NOTICE
+aapt2-proto-7.0.0-beta04-7396180.NOTICE
------------------------------------------------------------
Apache License
@@ -558,142 +558,8 @@
limitations under the License.
============================================================
Notices for file(s):
-kotlin-compiler-all.NOTICE
+commons-io-2.4.NOTICE
------------------------------------------------------------
- =========================================================================
- == NOTICE file corresponding to the section 4 d of ==
- == the Apache License, Version 2.0, ==
- == in this case for the Kotlin Compiler distribution. ==
- =========================================================================
-
- Kotlin Compiler
- Copyright 2010-2015 JetBrains s.r.o and respective authors and developers
-============================================================
-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):
-libaapt2-proto-with-notice.NOTICE
-------------------------------------------------------------
- Copyright (c) 2005-2008, 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.
-
- 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.
-
Apache License
Version 2.0, January 2004
@@ -872,6 +738,144 @@
END OF TERMS AND CONDITIONS
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ 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):
+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
@@ -1663,6 +1667,97 @@
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
+
+1. Definitions.
+
+1.1. “Contributor” means each individual or entity that creates or contributes to the creation of Modifications.
+1.2. “Contributor Version” means the combination of the Original Software, prior Modifications used by a Contributor (if any), and the Modifications made by that particular Contributor.
+1.3. “Covered Software” means (a) the Original Software, or (b) Modifications, or (c) the combination of files containing Original Software with files containing Modifications, in each case including portions thereof.
+1.4. “Executable” means the Covered Software in any form other than Source Code.
+1.5. “Initial Developer” means the individual or entity that first makes Original Software available under this License.
+1.6. “Larger Work” means a work which combines Covered Software or portions thereof with code not governed by the terms of this License.
+1.7. “License” means this document.
+1.8. “Licensable” means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently acquired, any and all of the rights conveyed herein.
+1.9. “Modifications” means the Source Code and Executable form of any of the following:
+A. Any file that results from an addition to, deletion from or modification of the contents of a file containing Original Software or previous Modifications;
+B. Any new file that contains any part of the Original Software or previous Modification; or
+C. Any new file that is contributed or otherwise made available under the terms of this License.
+1.10. “Original Software” means the Source Code and Executable form of computer software code that is originally released under this License.
+1.11. “Patent Claims” means any patent claim(s), now owned or hereafter acquired, including without limitation, method, process, and apparatus claims, in any patent Licensable by grantor.
+1.12. “Source Code” means (a) the common form of computer software code in which modifications are made and (b) associated documentation included in or with such code.
+1.13. “You” (or “Your”) means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, “You” includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, “control” means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity.
+2. License Grants.
+
+2.1. The Initial Developer Grant.
+Conditioned upon Your compliance with Section 3.1 below and subject to third party intellectual property claims, the Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license:
+(a) under intellectual property rights (other than patent or trademark) Licensable by Initial Developer, to use, reproduce, modify, display, perform, sublicense and distribute the Original Software (or portions thereof), with or without Modifications, and/or as part of a Larger Work; and
+(b) under Patent Claims infringed by the making, using or selling of Original Software, to make, have made, use, practice, sell, and offer for sale, and/or otherwise dispose of the Original Software (or portions thereof).
+(c) The licenses granted in Sections 2.1(a) and (b) are effective on the date Initial Developer first distributes or otherwise makes the Original Software available to a third party under the terms of this License.
+(d) Notwithstanding Section 2.1(b) above, no patent license is granted: (1) for code that You delete from the Original Software, or (2) for infringements caused by: (i) the modification of the Original Software, or (ii) the combination of the Original Software with other software or devices.
+2.2. Contributor Grant.
+Conditioned upon Your compliance with Section 3.1 below and subject to third party intellectual property claims, each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license:
+(a) under intellectual property rights (other than patent or trademark) Licensable by Contributor to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof), either on an unmodified basis, with other Modifications, as Covered Software and/or as part of a Larger Work; and
+(b) under Patent Claims infringed by the making, using, or selling of Modifications made by that Contributor either alone and/or in combination with its Contributor Version (or portions of such combination), to make, use, sell, offer for sale, have made, and/or otherwise dispose of: (1) Modifications made by that Contributor (or portions thereof); and (2) the combination of Modifications made by that Contributor with its Contributor Version (or portions of such combination).
+(c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective on the date Contributor first distributes or otherwise makes the Modifications available to a third party.
+(d) Notwithstanding Section 2.2(b) above, no patent license is granted: (1) for any code that Contributor has deleted from the Contributor Version; (2) for infringements caused by: (i) third party modifications of Contributor Version, or (ii) the combination of Modifications made by that Contributor with other software (except as part of the Contributor Version) or other devices; or (3) under Patent Claims infringed by Covered Software in the absence of Modifications made by that Contributor.
+3. Distribution Obligations.
+
+3.1. Availability of Source Code.
+Any Covered Software that You distribute or otherwise make available in Executable form must also be made available in Source Code form and that Source Code form must be distributed only under the terms of this License. You must include a copy of this License with every copy of the Source Code form of the Covered Software You distribute or otherwise make available. You must inform recipients of any such Covered Software in Executable form as to how they can obtain such Covered Software in Source Code form in a reasonable manner on or through a medium customarily used for software exchange.
+3.2. Modifications.
+The Modifications that You create or to which You contribute are governed by the terms of this License. You represent that You believe Your Modifications are Your original creation(s) and/or You have sufficient rights to grant the rights conveyed by this License.
+3.3. Required Notices.
+You must include a notice in each of Your Modifications that identifies You as the Contributor of the Modification. You may not remove or alter any copyright, patent or trademark notices contained within the Covered Software, or any notices of licensing or any descriptive text giving attribution to any Contributor or the Initial Developer.
+3.4. Application of Additional Terms.
+You may not offer or impose any terms on any Covered Software in Source Code form that alters or restricts the applicable version of this License or the recipients' rights hereunder. You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Software. However, you may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. You must make it absolutely clear that any such warranty, support, indemnity or liability obligation is offered by You alone, and You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of warranty, support, indemnity or liability terms You offer.
+3.5. Distribution of Executable Versions.
+You may distribute the Executable form of the Covered Software under the terms of this License or under the terms of a license of Your choice, which may contain terms different from this License, provided that You are in compliance with the terms of this License and that the license for the Executable form does not attempt to limit or alter the recipient's rights in the Source Code form from the rights set forth in this License. If You distribute the Covered Software in Executable form under a different license, You must make it absolutely clear that any terms which differ from this License are offered by You alone, not by the Initial Developer or Contributor. You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of any such terms You offer.
+3.6. Larger Works.
+You may create a Larger Work by combining Covered Software with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Software.
+4. Versions of the License.
+
+4.1. New Versions.
+Oracle is the initial license steward and may publish revised and/or new versions of this License from time to time. Each version will be given a distinguishing version number. Except as provided in Section 4.3, no one other than the license steward has the right to modify this License.
+4.2. Effect of New Versions.
+You may always continue to use, distribute or otherwise make the Covered Software available under the terms of the version of the License under which You originally received the Covered Software. If the Initial Developer includes a notice in the Original Software prohibiting it from being distributed or otherwise made available under any subsequent version of the License, You must distribute and make the Covered Software available under the terms of the version of the License under which You originally received the Covered Software. Otherwise, You may also choose to use, distribute or otherwise make the Covered Software available under the terms of any subsequent version of the License published by the license steward.
+4.3. Modified Versions.
+When You are an Initial Developer and You want to create a new license for Your Original Software, You may create and use a modified version of this License if You: (a) rename the license and remove any references to the name of the license steward (except to note that the license differs from this License); and (b) otherwise make it clear that the license contains terms which differ from this License.
+5. DISCLAIMER OF WARRANTY.
+
+COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN “AS IS” BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+
+6. TERMINATION.
+
+6.1. This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive.
+6.2. If You assert a patent infringement claim (excluding declaratory judgment actions) against Initial Developer or a Contributor (the Initial Developer or Contributor against whom You assert such claim is referred to as “Participant”) alleging that the Participant Software (meaning the Contributor Version where the Participant is a Contributor or the Original Software where the Participant is the Initial Developer) directly or indirectly infringes any patent, then any and all rights granted directly or indirectly to You by such Participant, the Initial Developer (if the Initial Developer is not the Participant) and all Contributors under Sections 2.1 and/or 2.2 of this License shall, upon 60 days notice from Participant terminate prospectively and automatically at the expiration of such 60 day notice period, unless if within such 60 day period You withdraw Your claim with respect to the Participant Software against such Participant either unilaterally or pursuant to a written agreement with Participant.
+6.3. If You assert a patent infringement claim against Participant alleging that the Participant Software directly or indirectly infringes any patent where such claim is resolved (such as by license or settlement) prior to the initiation of patent infringement litigation, then the reasonable value of the licenses granted by such Participant under Sections 2.1 or 2.2 shall be taken into account in determining the amount or value of any payment or license.
+6.4. In the event of termination under Sections 6.1 or 6.2 above, all end user licenses that have been validly granted by You or any distributor hereunder prior to termination (excluding licenses granted to You by any distributor) shall survive termination.
+7. LIMITATION OF LIABILITY.
+
+UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
+
+8. U.S. GOVERNMENT END USERS.
+
+The Covered Software is a “commercial item,” as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of “commercial computer software” (as that term is defined at 48 C.F.R. § 252.227-7014(a)(1)) and “commercial computer software documentation” as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Software with only those rights set forth herein. This U.S. Government Rights clause is in lieu of, and supersedes, any other FAR, DFAR, or other clause or provision that addresses Government rights in computer software under this License.
+
+9. MISCELLANEOUS.
+
+This License represents the complete agreement concerning subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. This License shall be governed by the law of the jurisdiction specified in a notice contained within the Original Software (except to the extent applicable law, if any, provides otherwise), excluding such jurisdiction's conflict-of-law provisions. Any litigation relating to this License shall be subject to the jurisdiction of the courts located in the jurisdiction and venue specified in a notice contained within the Original Software, with the losing party responsible for costs, including, without limitation, court costs and reasonable attorneys' fees and expenses. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any law or regulation which provides that the language of a contract shall be construed against the drafter shall not apply to this License. You agree that You alone are responsible for compliance with the United States export administration regulations (and the export control laws and regulation of any other countries) when You use, distribute or otherwise make available any Covered Software.
+
+10. RESPONSIBILITY FOR CLAIMS.
+
+As between Initial Developer and the Contributors, each party is responsible for claims and damages arising, directly or indirectly, out of its utilization of rights under this License and You agree to work with Initial Developer and Contributors to distribute such responsibility on an equitable basis. Nothing herein is intended or shall be deemed to constitute any admission of liability.
+
+NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)
+
+The code released under the CDDL shall be governed by the laws of the State of California (excluding conflict-of-law provisions). Any litigation relating to this License shall be subject to the jurisdiction of the Federal Courts of the Northern District of California and the state courts of the State of California, with venue lying in Santa Clara County, California.
+
+
+============================================================
+Notices for file(s):
asm-9.1.NOTICE
asm-tree-9.1.NOTICE
asm-analysis-9.1.NOTICE
diff --git a/tools/lib/analytics-library/protos/src/main/proto/libproto.jar b/tools/lib/analytics-library/protos/src/main/proto/proto.jar
similarity index 77%
rename from tools/lib/analytics-library/protos/src/main/proto/libproto.jar
rename to tools/lib/analytics-library/protos/src/main/proto/proto.jar
index aadeee5..435ffaa 100755
--- a/tools/lib/analytics-library/protos/src/main/proto/libproto.jar
+++ b/tools/lib/analytics-library/protos/src/main/proto/proto.jar
Binary files differ
diff --git a/tools/lib/analytics-library/shared/analytics-shared.jar b/tools/lib/analytics-library/shared/analytics-shared.jar
deleted file mode 100755
index 33a0b4e..0000000
--- a/tools/lib/analytics-library/shared/analytics-shared.jar
+++ /dev/null
Binary files differ
diff --git a/tools/lib/analytics-library/shared/tools.analytics-shared.jar b/tools/lib/analytics-library/shared/tools.analytics-shared.jar
new file mode 100755
index 0000000..b0622bb
--- /dev/null
+++ b/tools/lib/analytics-library/shared/tools.analytics-shared.jar
Binary files differ
diff --git a/tools/lib/analytics-library/tracker/analytics-tracker.jar b/tools/lib/analytics-library/tracker/analytics-tracker.jar
deleted file mode 100755
index 96f6eff..0000000
--- a/tools/lib/analytics-library/tracker/analytics-tracker.jar
+++ /dev/null
Binary files differ
diff --git a/tools/lib/analytics-library/tracker/tools.analytics-tracker.jar b/tools/lib/analytics-library/tracker/tools.analytics-tracker.jar
new file mode 100755
index 0000000..a992b12
--- /dev/null
+++ b/tools/lib/analytics-library/tracker/tools.analytics-tracker.jar
Binary files differ
diff --git a/tools/lib/annotations/libannotations.jar b/tools/lib/annotations/annotations.jar
similarity index 96%
rename from tools/lib/annotations/libannotations.jar
rename to tools/lib/annotations/annotations.jar
index 9eb8c0c..4dadb62 100755
--- a/tools/lib/annotations/libannotations.jar
+++ b/tools/lib/annotations/annotations.jar
Binary files differ
diff --git a/tools/lib/apkanalyzer-classpath.jar b/tools/lib/apkanalyzer-classpath.jar
index 0a7cafe..eaafc26 100755
--- a/tools/lib/apkanalyzer-classpath.jar
+++ b/tools/lib/apkanalyzer-classpath.jar
Binary files differ
diff --git a/tools/lib/avdmanager-classpath.jar b/tools/lib/avdmanager-classpath.jar
index 3ab5143..1fb0f8e 100755
--- a/tools/lib/avdmanager-classpath.jar
+++ b/tools/lib/avdmanager-classpath.jar
Binary files differ
diff --git a/tools/lib/build-system/aapt2-proto/libaapt2-proto-with-notice.jar b/tools/lib/build-system/aapt2-proto/libaapt2-proto-with-notice.jar
deleted file mode 100755
index 03e9781..0000000
--- a/tools/lib/build-system/aapt2-proto/libaapt2-proto-with-notice.jar
+++ /dev/null
Binary files differ
diff --git a/tools/lib/build-system/aaptcompiler/libaaptcompiler.jar b/tools/lib/build-system/aaptcompiler/libaaptcompiler.jar
deleted file mode 100755
index 8e2071e..0000000
--- a/tools/lib/build-system/aaptcompiler/libaaptcompiler.jar
+++ /dev/null
Binary files differ
diff --git a/tools/lib/build-system/builder-model/builder-model.jar b/tools/lib/build-system/builder-model/builder-model.jar
new file mode 100755
index 0000000..929e04c
--- /dev/null
+++ b/tools/lib/build-system/builder-model/builder-model.jar
Binary files differ
diff --git a/tools/lib/build-system/builder-model/libbuilder-model.jar b/tools/lib/build-system/builder-model/libbuilder-model.jar
deleted file mode 100755
index d058fff..0000000
--- a/tools/lib/build-system/builder-model/libbuilder-model.jar
+++ /dev/null
Binary files differ
diff --git a/tools/lib/build-system/builder-test-api/builder-test-api.jar b/tools/lib/build-system/builder-test-api/tools.builder-test-api.jar
similarity index 96%
rename from tools/lib/build-system/builder-test-api/builder-test-api.jar
rename to tools/lib/build-system/builder-test-api/tools.builder-test-api.jar
index 1c348bc..ad70880 100755
--- a/tools/lib/build-system/builder-test-api/builder-test-api.jar
+++ b/tools/lib/build-system/builder-test-api/tools.builder-test-api.jar
Binary files differ
diff --git a/tools/lib/build-system/manifest-merger.jar b/tools/lib/build-system/manifest-merger.jar
deleted file mode 100755
index 8278650..0000000
--- a/tools/lib/build-system/manifest-merger.jar
+++ /dev/null
Binary files differ
diff --git a/tools/lib/build-system/tools.manifest-merger.jar b/tools/lib/build-system/tools.manifest-merger.jar
new file mode 100755
index 0000000..28dcb31
--- /dev/null
+++ b/tools/lib/build-system/tools.manifest-merger.jar
Binary files differ
diff --git a/tools/lib/common/common.jar b/tools/lib/common/common.jar
deleted file mode 100755
index de0cc23..0000000
--- a/tools/lib/common/common.jar
+++ /dev/null
Binary files differ
diff --git a/tools/lib/common/tools.common.jar b/tools/lib/common/tools.common.jar
new file mode 100755
index 0000000..8a6b231
--- /dev/null
+++ b/tools/lib/common/tools.common.jar
Binary files differ
diff --git a/tools/lib/ddmlib/ddmlib.jar b/tools/lib/ddmlib/tools.ddmlib.jar
similarity index 62%
rename from tools/lib/ddmlib/ddmlib.jar
rename to tools/lib/ddmlib/tools.ddmlib.jar
index 8647f67..e7c0f2d 100755
--- a/tools/lib/ddmlib/ddmlib.jar
+++ b/tools/lib/ddmlib/tools.ddmlib.jar
Binary files differ
diff --git a/tools/lib/device_validator/dvlib.jar b/tools/lib/device_validator/tools.dvlib.jar
similarity index 91%
rename from tools/lib/device_validator/dvlib.jar
rename to tools/lib/device_validator/tools.dvlib.jar
index dc8b5f4..5f035e9 100755
--- a/tools/lib/device_validator/dvlib.jar
+++ b/tools/lib/device_validator/tools.dvlib.jar
Binary files differ
diff --git a/tools/lib/external/com/android/tools/build/aapt2-proto/4.1.0-alpha01-6193524/aapt2-proto-4.1.0-alpha01-6193524.jar b/tools/lib/external/com/android/tools/build/aapt2-proto/4.1.0-alpha01-6193524/aapt2-proto-4.1.0-alpha01-6193524.jar
deleted file mode 100755
index 749f49d..0000000
--- a/tools/lib/external/com/android/tools/build/aapt2-proto/4.1.0-alpha01-6193524/aapt2-proto-4.1.0-alpha01-6193524.jar
+++ /dev/null
Binary files differ
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
new file mode 100755
index 0000000..f9f874b
--- /dev/null
+++ b/tools/lib/external/com/android/tools/build/aapt2-proto/7.0.0-beta04-7396180/aapt2-proto-7.0.0-beta04-7396180.jar
Binary files differ
diff --git a/tools/lib/external/com/google/jimfs/jimfs/1.1/jimfs-1.1.jar b/tools/lib/external/com/google/jimfs/jimfs/1.1/jimfs-1.1.jar
new file mode 100755
index 0000000..e0b16a5
--- /dev/null
+++ b/tools/lib/external/com/google/jimfs/jimfs/1.1/jimfs-1.1.jar
Binary files differ
diff --git a/tools/lib/external/com/sun/activation/javax.activation/1.2.0/javax.activation-1.2.0.jar b/tools/lib/external/com/sun/activation/javax.activation/1.2.0/javax.activation-1.2.0.jar
new file mode 100755
index 0000000..9637479
--- /dev/null
+++ b/tools/lib/external/com/sun/activation/javax.activation/1.2.0/javax.activation-1.2.0.jar
Binary files differ
diff --git a/tools/lib/external/commons-codec/commons-codec/1.10/commons-codec-1.10.jar b/tools/lib/external/commons-codec/commons-codec/1.10/commons-codec-1.10.jar
deleted file mode 100755
index 1d7417c..0000000
--- a/tools/lib/external/commons-codec/commons-codec/1.10/commons-codec-1.10.jar
+++ /dev/null
Binary files differ
diff --git a/tools/lib/external/commons-codec/commons-codec/1.11/commons-codec-1.11.jar b/tools/lib/external/commons-codec/commons-codec/1.11/commons-codec-1.11.jar
new file mode 100755
index 0000000..2245120
--- /dev/null
+++ b/tools/lib/external/commons-codec/commons-codec/1.11/commons-codec-1.11.jar
Binary files differ
diff --git a/tools/lib/external/commons-io/commons-io/2.4/commons-io-2.4.jar b/tools/lib/external/commons-io/commons-io/2.4/commons-io-2.4.jar
new file mode 100755
index 0000000..90035a4
--- /dev/null
+++ b/tools/lib/external/commons-io/commons-io/2.4/commons-io-2.4.jar
Binary files differ
diff --git a/tools/lib/external/lint-psi/intellij-core/intellij-core-all.jar b/tools/lib/external/lint-psi/intellij-core/intellij-core-mvn.jar
similarity index 97%
rename from tools/lib/external/lint-psi/intellij-core/intellij-core-all.jar
rename to tools/lib/external/lint-psi/intellij-core/intellij-core-mvn.jar
index 4890ddf..fca7ebf 100755
--- a/tools/lib/external/lint-psi/intellij-core/intellij-core-all.jar
+++ b/tools/lib/external/lint-psi/intellij-core/intellij-core-mvn.jar
Binary files differ
diff --git a/tools/lib/external/lint-psi/kotlin-compiler/kotlin-compiler-all.jar b/tools/lib/external/lint-psi/kotlin-compiler/kotlin-compiler-all.jar
deleted file mode 100755
index 7c96f11..0000000
--- a/tools/lib/external/lint-psi/kotlin-compiler/kotlin-compiler-all.jar
+++ /dev/null
Binary files differ
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
new file mode 100755
index 0000000..ff7f88f
--- /dev/null
+++ b/tools/lib/external/lint-psi/kotlin-compiler/kotlin-compiler-mvn.jar
Binary files differ
diff --git a/tools/lib/external/lint-psi/uast/uast-all.jar b/tools/lib/external/lint-psi/uast/uast-all.jar
deleted file mode 100755
index 636bb5f..0000000
--- a/tools/lib/external/lint-psi/uast/uast-all.jar
+++ /dev/null
Binary files differ
diff --git a/tools/lib/external/lint-psi/uast/uast.jar b/tools/lib/external/lint-psi/uast/uast.jar
new file mode 100755
index 0000000..8e0c4e9
--- /dev/null
+++ b/tools/lib/external/lint-psi/uast/uast.jar
Binary files differ
diff --git a/tools/lib/external/org/apache/httpcomponents/httpclient/4.5.6/httpclient-4.5.6.jar b/tools/lib/external/org/apache/httpcomponents/httpclient/4.5.6/httpclient-4.5.6.jar
deleted file mode 100755
index 56231de..0000000
--- a/tools/lib/external/org/apache/httpcomponents/httpclient/4.5.6/httpclient-4.5.6.jar
+++ /dev/null
Binary files differ
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.9/httpclient-4.5.9.jar
new file mode 100755
index 0000000..83bc29d
--- /dev/null
+++ b/tools/lib/external/org/apache/httpcomponents/httpclient/4.5.9/httpclient-4.5.9.jar
Binary files differ
diff --git a/tools/lib/external/org/apache/httpcomponents/httpcore/4.4.10/httpcore-4.4.10.jar b/tools/lib/external/org/apache/httpcomponents/httpcore/4.4.10/httpcore-4.4.10.jar
deleted file mode 100755
index dc510f8..0000000
--- a/tools/lib/external/org/apache/httpcomponents/httpcore/4.4.10/httpcore-4.4.10.jar
+++ /dev/null
Binary files differ
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.11/httpcore-4.4.11.jar
new file mode 100755
index 0000000..c31d401
--- /dev/null
+++ b/tools/lib/external/org/apache/httpcomponents/httpcore/4.4.11/httpcore-4.4.11.jar
Binary files differ
diff --git a/tools/lib/external/org/apache/httpcomponents/httpmime/4.5.6/httpmime-4.5.6.jar b/tools/lib/external/org/apache/httpcomponents/httpmime/4.5.6/httpmime-4.5.6.jar
new file mode 100755
index 0000000..df5a7d1
--- /dev/null
+++ b/tools/lib/external/org/apache/httpcomponents/httpmime/4.5.6/httpmime-4.5.6.jar
Binary files differ
diff --git a/tools/lib/layoutlib-api/layoutlib-api.jar b/tools/lib/layoutlib-api/tools.layoutlib-api.jar
similarity index 90%
rename from tools/lib/layoutlib-api/layoutlib-api.jar
rename to tools/lib/layoutlib-api/tools.layoutlib-api.jar
index f9230a9..847fd9d 100755
--- a/tools/lib/layoutlib-api/layoutlib-api.jar
+++ b/tools/lib/layoutlib-api/tools.layoutlib-api.jar
Binary files differ
diff --git a/tools/lib/lint-classpath.jar b/tools/lib/lint-classpath.jar
index 3b31cfd..da787ca 100755
--- a/tools/lib/lint-classpath.jar
+++ b/tools/lib/lint-classpath.jar
Binary files differ
diff --git a/tools/lib/lint/cli/cli.jar b/tools/lib/lint/cli/cli.jar
new file mode 100755
index 0000000..2672209
--- /dev/null
+++ b/tools/lib/lint/cli/cli.jar
Binary files differ
diff --git a/tools/lib/lint/cli/libcli.jar b/tools/lib/lint/cli/libcli.jar
deleted file mode 100755
index c91d892..0000000
--- a/tools/lib/lint/cli/libcli.jar
+++ /dev/null
Binary files differ
diff --git a/tools/lib/lint/lint-api.jar b/tools/lib/lint/lint-api.jar
deleted file mode 100755
index 6957b33..0000000
--- a/tools/lib/lint/lint-api.jar
+++ /dev/null
Binary files differ
diff --git a/tools/lib/lint/lint-checks.jar b/tools/lib/lint/lint-checks.jar
deleted file mode 100755
index 604bf20..0000000
--- a/tools/lib/lint/lint-checks.jar
+++ /dev/null
Binary files differ
diff --git a/tools/lib/lint/lint-model.jar b/tools/lib/lint/lint-model.jar
deleted file mode 100755
index 1f24b26..0000000
--- a/tools/lib/lint/lint-model.jar
+++ /dev/null
Binary files differ
diff --git a/tools/lib/lint/lint-tests.jar b/tools/lib/lint/lint-tests.jar
deleted file mode 100644
index b413572..0000000
--- a/tools/lib/lint/lint-tests.jar
+++ /dev/null
Binary files differ
diff --git a/tools/lib/lint/tools.lint-api.jar b/tools/lib/lint/tools.lint-api.jar
new file mode 100755
index 0000000..655947f
--- /dev/null
+++ b/tools/lib/lint/tools.lint-api.jar
Binary files differ
diff --git a/tools/lib/lint/tools.lint-checks.jar b/tools/lib/lint/tools.lint-checks.jar
new file mode 100755
index 0000000..8803657
--- /dev/null
+++ b/tools/lib/lint/tools.lint-checks.jar
Binary files differ
diff --git a/tools/lib/lint/tools.lint-model.jar b/tools/lib/lint/tools.lint-model.jar
new file mode 100755
index 0000000..9a4284f
--- /dev/null
+++ b/tools/lib/lint/tools.lint-model.jar
Binary files differ
diff --git a/tools/lib/profgen-classpath.jar b/tools/lib/profgen-classpath.jar
index f75bffd..862d771 100755
--- a/tools/lib/profgen-classpath.jar
+++ b/tools/lib/profgen-classpath.jar
Binary files differ
diff --git a/tools/lib/profgen/profgen-cli/libprofgen-cli-lib.jar b/tools/lib/profgen/profgen-cli/libprofgen-cli-lib.jar
index aea79a1..85e2f22 100755
--- a/tools/lib/profgen/profgen-cli/libprofgen-cli-lib.jar
+++ b/tools/lib/profgen/profgen-cli/libprofgen-cli-lib.jar
Binary files differ
diff --git a/tools/lib/profgen/profgen/libprofgen.jar b/tools/lib/profgen/profgen/libprofgen.jar
index 2be927c..add8b00 100755
--- a/tools/lib/profgen/profgen/libprofgen.jar
+++ b/tools/lib/profgen/profgen/libprofgen.jar
Binary files differ
diff --git a/tools/lib/r8.jar b/tools/lib/r8.jar
index bf0ddfc..d111a1e 100755
--- a/tools/lib/r8.jar
+++ b/tools/lib/r8.jar
Binary files differ
diff --git a/tools/lib/repository/repository.jar b/tools/lib/repository/tools.repository.jar
similarity index 88%
rename from tools/lib/repository/repository.jar
rename to tools/lib/repository/tools.repository.jar
index 0dc8af8..c8a85ad 100755
--- a/tools/lib/repository/repository.jar
+++ b/tools/lib/repository/tools.repository.jar
Binary files differ
diff --git a/tools/lib/screenshot2-classpath.jar b/tools/lib/screenshot2-classpath.jar
index f6bdddb..eacb9a7 100755
--- a/tools/lib/screenshot2-classpath.jar
+++ b/tools/lib/screenshot2-classpath.jar
Binary files differ
diff --git a/tools/lib/sdk-common/sdk-common.jar b/tools/lib/sdk-common/sdk-common.jar
deleted file mode 100755
index ee10f88..0000000
--- a/tools/lib/sdk-common/sdk-common.jar
+++ /dev/null
Binary files differ
diff --git a/tools/lib/sdk-common/tools.sdk-common.jar b/tools/lib/sdk-common/tools.sdk-common.jar
new file mode 100755
index 0000000..a64aedd
--- /dev/null
+++ b/tools/lib/sdk-common/tools.sdk-common.jar
Binary files differ
diff --git a/tools/lib/sdklib/libavdmanager_lib.jar b/tools/lib/sdklib/libavdmanager_lib.jar
index ebe1b20..404983a 100755
--- a/tools/lib/sdklib/libavdmanager_lib.jar
+++ b/tools/lib/sdklib/libavdmanager_lib.jar
Binary files differ
diff --git a/tools/lib/sdklib/libsdkmanager_lib.jar b/tools/lib/sdklib/libsdkmanager_lib.jar
index 9f08801..1aae567 100755
--- a/tools/lib/sdklib/libsdkmanager_lib.jar
+++ b/tools/lib/sdklib/libsdkmanager_lib.jar
Binary files differ
diff --git a/tools/lib/sdklib/sdklib.jar b/tools/lib/sdklib/tools.sdklib.jar
similarity index 77%
rename from tools/lib/sdklib/sdklib.jar
rename to tools/lib/sdklib/tools.sdklib.jar
index 2101cb6..984c875 100755
--- a/tools/lib/sdklib/sdklib.jar
+++ b/tools/lib/sdklib/tools.sdklib.jar
Binary files differ
diff --git a/tools/lib/sdkmanager-classpath.jar b/tools/lib/sdkmanager-classpath.jar
index 424e962..4242628 100755
--- a/tools/lib/sdkmanager-classpath.jar
+++ b/tools/lib/sdkmanager-classpath.jar
Binary files differ
