Update prebuilts/cmdline-tools to 7486794 am: d7db3f7589 am: 2fd35ef578
Original change: https://android-review.googlesource.com/c/platform/prebuilts/cmdline-tools/+/1746780
Change-Id: I5714cfdef0ab37eb233bb3c4aa6d1a77e65cd550
diff --git a/Android.bp b/Android.bp
index 8ddf032..1e462f4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -39,7 +39,7 @@
// 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/28.1-jre/guava-28.1-jre.jar",
+ "tools/lib/external/com/google/guava/guava/30.1-jre/guava-30.1-jre.jar",
"tools/lib/external/lint-psi/intellij-core/intellij-core-all.jar",
"tools/lib/external/lint-psi/kotlin-compiler/kotlin-compiler-all.jar",
"tools/lib/external/lint-psi/uast/uast-all.jar",
diff --git a/tools/NOTICE.txt b/tools/NOTICE.txt
index 8f8aed4..68a4aa6 100755
--- a/tools/NOTICE.txt
+++ b/tools/NOTICE.txt
@@ -1,10 +1,10 @@
============================================================
Notices for file(s):
-kotlin-stdlib-common-1.3.72.NOTICE
-kotlin-stdlib-1.3.72.NOTICE
-kotlin-stdlib-jdk7-1.3.72.NOTICE
-kotlin-stdlib-jdk8-1.3.72.NOTICE
-kotlin-reflect-1.3.72.NOTICE
+kotlin-stdlib-common-1.4.32.NOTICE
+kotlin-stdlib-1.4.32.NOTICE
+kotlin-stdlib-jdk7-1.4.32.NOTICE
+kotlin-stdlib-jdk8-1.4.32.NOTICE
+kotlin-reflect-1.4.32.NOTICE
------------------------------------------------------------
/*
* Copyright 2010-2015 JetBrains s.r.o.
@@ -23,6 +23,28 @@
*/
============================================================
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
+stax-ex-1.8.1.NOTICE
+jaxb-runtime-2.3.2.NOTICE
+------------------------------------------------------------
+Eclipse Distribution License - v 1.0
+
+Copyright (c) 2007, Eclipse Foundation, Inc. and its licensors.
+
+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 the Eclipse Foundation, 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.
+
+============================================================
+Notices for file(s):
kxml2-2.3.0.NOTICE
------------------------------------------------------------
Copyright (c) 2002,2003, Stefan Haustein, Oberhausen, Rhld., Germany
@@ -47,7 +69,7 @@
============================================================
Notices for file(s):
-checker-qual-2.8.1.NOTICE
+checker-qual-3.5.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
@@ -106,15 +128,17 @@
============================================================
Notices for file(s):
jsr305-3.0.2.NOTICE
-error_prone_annotations-2.3.2.NOTICE
+error_prone_annotations-2.3.4.NOTICE
failureaccess-1.0.1.NOTICE
listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.NOTICE
j2objc-annotations-1.3.NOTICE
-guava-28.1-jre.NOTICE
+guava-30.1-jre.NOTICE
annotations-13.0.NOTICE
-commons-compress-1.12.NOTICE
-FastInfoset-1.2.15.NOTICE
-gson-2.8.5.NOTICE
+gson-2.8.6.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
@@ -327,9 +351,8 @@
limitations under the License.
============================================================
Notices for file(s):
-animal-sniffer-annotations-1.18.NOTICE
javax.inject-1.NOTICE
-jcommander-1.64.NOTICE
+jcommander-1.78.NOTICE
------------------------------------------------------------
Apache License
@@ -658,7 +681,200 @@
*******************************************************************************
============================================================
Notices for file(s):
-trove4j-20160824.NOTICE
+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
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+============================================================
+Notices for file(s):
+trove4j-1.0.20181211.NOTICE
------------------------------------------------------------
GNU LESSER GENERAL PUBLIC LICENSE
Version 2.1, February 1999
@@ -1212,6 +1428,229 @@
support library is itself covered by the above license.
============================================================
Notices for file(s):
+xml-apis-1.4.01.NOTICE
+xercesImpl-2.12.0.NOTICE
+------------------------------------------------------------
+ Apache Xerces Java
+ Copyright 1999-2006 The Apache Software Foundation
+
+ This product includes software developed at
+ The Apache Software Foundation (http://www.apache.org/).
+
+ Portions of Apache Xerces Java in xercesImpl.jar and xml-apis.jar
+ were originally based on the following:
+ - software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
+ - software copyright (c) 1999, Sun Microsystems., http://www.sun.com.
+ - voluntary contributions made by Paul Eng on behalf of the
+ Apache Software Foundation that were originally developed at iClick, Inc.,
+ software copyright (c) 1999.
+============================================================
+Notices for file(s):
+kotlinx-cli-jvm-0.3.1.NOTICE
+------------------------------------------------------------
+ Apache License
+ Version 2.0, January 2004
+ https://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ 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
+
+ https://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):
bcprov-jdk15on-1.56.NOTICE
bcpkix-jdk15on-1.56.NOTICE
------------------------------------------------------------
@@ -1224,105 +1663,9 @@
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):
-istack-commons-runtime-3.0.7.NOTICE
-javax.activation-api-1.2.0.NOTICE
-jaxb-api-2.3.1.NOTICE
-txw2-2.3.1.NOTICE
-stax-ex-1.8.NOTICE
-jaxb-runtime-2.3.1.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-7.0.NOTICE
-asm-tree-7.0.NOTICE
-asm-analysis-7.0.NOTICE
+asm-9.1.NOTICE
+asm-tree-9.1.NOTICE
+asm-analysis-9.1.NOTICE
------------------------------------------------------------
Copyright (c) 2000-2011 INRIA, France Telecom
All rights reserved.
diff --git a/tools/bin/profgen b/tools/bin/profgen
new file mode 100755
index 0000000..6d792bc
--- /dev/null
+++ b/tools/bin/profgen
@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+## profgen 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="profgen"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and PROFGEN_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/profgen-classpath.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ if [ ! -x "$JAVACMD" ] ; then
+ die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+else
+ JAVACMD="java"
+ which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+ MAX_FD_LIMIT=`ulimit -H -n`
+ if [ $? -eq 0 ] ; then
+ if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+ MAX_FD="$MAX_FD_LIMIT"
+ fi
+ ulimit -n $MAX_FD
+ if [ $? -ne 0 ] ; then
+ warn "Could not set maximum file descriptor limit: $MAX_FD"
+ fi
+ else
+ warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+ fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+ GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+ APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+ CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+ JAVACMD=`cygpath --unix "$JAVACMD"`
+
+ # We build the pattern for arguments to be converted via cygpath
+ ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+ SEP=""
+ for dir in $ROOTDIRSRAW ; do
+ ROOTDIRS="$ROOTDIRS$SEP$dir"
+ SEP="|"
+ done
+ OURCYGPATTERN="(^($ROOTDIRS))"
+ # Add a user-defined pattern to the cygpath arguments
+ if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+ OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+ fi
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ i=0
+ for arg in "$@" ; do
+ CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+ CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
+
+ if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
+ eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+ else
+ eval `echo args$i`="\"$arg\""
+ fi
+ i=$((i+1))
+ done
+ case $i in
+ (0) set -- ;;
+ (1) set -- "$args0" ;;
+ (2) set -- "$args0" "$args1" ;;
+ (3) set -- "$args0" "$args1" "$args2" ;;
+ (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+ (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+ (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+ (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+ (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+ (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+ esac
+fi
+
+# Escape application args
+save () {
+ for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+ echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $PROFGEN_OPTS -classpath "\"$CLASSPATH\"" com.android.tools.profgen.cli.MainKt "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+ cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/tools/bin/retrace b/tools/bin/retrace
new file mode 100755
index 0000000..c5872e9
--- /dev/null
+++ b/tools/bin/retrace
@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+## retrace 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="retrace"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and RETRACE_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/retrace-classpath.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ if [ ! -x "$JAVACMD" ] ; then
+ die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+else
+ JAVACMD="java"
+ which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+ MAX_FD_LIMIT=`ulimit -H -n`
+ if [ $? -eq 0 ] ; then
+ if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+ MAX_FD="$MAX_FD_LIMIT"
+ fi
+ ulimit -n $MAX_FD
+ if [ $? -ne 0 ] ; then
+ warn "Could not set maximum file descriptor limit: $MAX_FD"
+ fi
+ else
+ warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+ fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+ GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+ APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+ CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+ JAVACMD=`cygpath --unix "$JAVACMD"`
+
+ # We build the pattern for arguments to be converted via cygpath
+ ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+ SEP=""
+ for dir in $ROOTDIRSRAW ; do
+ ROOTDIRS="$ROOTDIRS$SEP$dir"
+ SEP="|"
+ done
+ OURCYGPATTERN="(^($ROOTDIRS))"
+ # Add a user-defined pattern to the cygpath arguments
+ if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+ OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+ fi
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ i=0
+ for arg in "$@" ; do
+ CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+ CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
+
+ if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
+ eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+ else
+ eval `echo args$i`="\"$arg\""
+ fi
+ i=$((i+1))
+ done
+ case $i in
+ (0) set -- ;;
+ (1) set -- "$args0" ;;
+ (2) set -- "$args0" "$args1" ;;
+ (3) set -- "$args0" "$args1" "$args2" ;;
+ (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+ (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+ (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+ (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+ (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+ (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+ esac
+fi
+
+# Escape application args
+save () {
+ for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+ echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $RETRACE_OPTS -classpath "\"$CLASSPATH\"" com.android.tools.r8.retrace.Retrace "$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/libproto.jar b/tools/lib/analytics-library/protos/src/main/proto/libproto.jar
index 0886a25..aadeee5 100755
--- a/tools/lib/analytics-library/protos/src/main/proto/libproto.jar
+++ b/tools/lib/analytics-library/protos/src/main/proto/libproto.jar
Binary files differ
diff --git a/tools/lib/analytics-library/shared/analytics-shared.jar b/tools/lib/analytics-library/shared/analytics-shared.jar
index ade1ed0..33a0b4e 100755
--- a/tools/lib/analytics-library/shared/analytics-shared.jar
+++ b/tools/lib/analytics-library/shared/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
index 1830bd7..96f6eff 100755
--- a/tools/lib/analytics-library/tracker/analytics-tracker.jar
+++ b/tools/lib/analytics-library/tracker/analytics-tracker.jar
Binary files differ
diff --git a/tools/lib/annotations/libannotations.jar b/tools/lib/annotations/libannotations.jar
index d714010..9eb8c0c 100755
--- a/tools/lib/annotations/libannotations.jar
+++ b/tools/lib/annotations/libannotations.jar
Binary files differ
diff --git a/tools/lib/apkanalyzer-classpath.jar b/tools/lib/apkanalyzer-classpath.jar
index 0e364bb..0a7cafe 100755
--- a/tools/lib/apkanalyzer-classpath.jar
+++ b/tools/lib/apkanalyzer-classpath.jar
Binary files differ
diff --git a/tools/lib/apkparser/analyzer/analyzer.jar b/tools/lib/apkparser/analyzer/analyzer.jar
index ff13a98..9d02ef6 100755
--- a/tools/lib/apkparser/analyzer/analyzer.jar
+++ b/tools/lib/apkparser/analyzer/analyzer.jar
Binary files differ
diff --git a/tools/lib/apkparser/binary-resources.jar b/tools/lib/apkparser/binary-resources.jar
index 5ab8ccb..efebf76 100755
--- a/tools/lib/apkparser/binary-resources.jar
+++ b/tools/lib/apkparser/binary-resources.jar
Binary files differ
diff --git a/tools/lib/apkparser/cli/analyzer-cli.jar b/tools/lib/apkparser/cli/analyzer-cli.jar
index a707e8a..d3f75ec 100755
--- a/tools/lib/apkparser/cli/analyzer-cli.jar
+++ b/tools/lib/apkparser/cli/analyzer-cli.jar
Binary files differ
diff --git a/tools/lib/avdmanager-classpath.jar b/tools/lib/avdmanager-classpath.jar
index 1034abb..3ab5143 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
new file mode 100755
index 0000000..03e9781
--- /dev/null
+++ b/tools/lib/build-system/aapt2-proto/libaapt2-proto-with-notice.jar
Binary files differ
diff --git a/tools/lib/build-system/aapt2-proto/libaapt2-proto.jar b/tools/lib/build-system/aapt2-proto/libaapt2-proto.jar
deleted file mode 100755
index 4653567..0000000
--- a/tools/lib/build-system/aapt2-proto/libaapt2-proto.jar
+++ /dev/null
Binary files differ
diff --git a/tools/lib/build-system/aaptcompiler/libaaptcompiler.jar b/tools/lib/build-system/aaptcompiler/libaaptcompiler.jar
index e474ae4..8e2071e 100755
--- a/tools/lib/build-system/aaptcompiler/libaaptcompiler.jar
+++ b/tools/lib/build-system/aaptcompiler/libaaptcompiler.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
index 630c5d2..d058fff 100755
--- a/tools/lib/build-system/builder-model/libbuilder-model.jar
+++ b/tools/lib/build-system/builder-model/libbuilder-model.jar
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/builder-test-api.jar
index 9535f07..1c348bc 100755
--- a/tools/lib/build-system/builder-test-api/builder-test-api.jar
+++ b/tools/lib/build-system/builder-test-api/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
index 94517fe..8278650 100755
--- a/tools/lib/build-system/manifest-merger.jar
+++ b/tools/lib/build-system/manifest-merger.jar
Binary files differ
diff --git a/tools/lib/common/common.jar b/tools/lib/common/common.jar
index f355ec0..de0cc23 100755
--- a/tools/lib/common/common.jar
+++ b/tools/lib/common/common.jar
Binary files differ
diff --git a/tools/lib/ddmlib/ddmlib.jar b/tools/lib/ddmlib/ddmlib.jar
index 6e0e801..8647f67 100755
--- a/tools/lib/ddmlib/ddmlib.jar
+++ b/tools/lib/ddmlib/ddmlib.jar
Binary files differ
diff --git a/tools/lib/device_validator/dvlib.jar b/tools/lib/device_validator/dvlib.jar
index c9812b2..dc8b5f4 100755
--- a/tools/lib/device_validator/dvlib.jar
+++ b/tools/lib/device_validator/dvlib.jar
Binary files differ
diff --git a/tools/lib/external/com/beust/jcommander/1.64/jcommander-1.64.jar b/tools/lib/external/com/beust/jcommander/1.64/jcommander-1.64.jar
deleted file mode 100755
index 805df99..0000000
--- a/tools/lib/external/com/beust/jcommander/1.64/jcommander-1.64.jar
+++ /dev/null
Binary files differ
diff --git a/tools/lib/external/com/beust/jcommander/1.78/jcommander-1.78.jar b/tools/lib/external/com/beust/jcommander/1.78/jcommander-1.78.jar
new file mode 100755
index 0000000..1d58673
--- /dev/null
+++ b/tools/lib/external/com/beust/jcommander/1.78/jcommander-1.78.jar
Binary files differ
diff --git a/tools/lib/external/com/google/code/gson/gson/2.8.5/gson-2.8.5.jar b/tools/lib/external/com/google/code/gson/gson/2.8.5/gson-2.8.5.jar
deleted file mode 100755
index 0d5baf3..0000000
--- a/tools/lib/external/com/google/code/gson/gson/2.8.5/gson-2.8.5.jar
+++ /dev/null
Binary files differ
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
new file mode 100755
index 0000000..4765c4a
--- /dev/null
+++ b/tools/lib/external/com/google/code/gson/gson/2.8.6/gson-2.8.6.jar
Binary files differ
diff --git a/tools/lib/external/com/google/errorprone/error_prone_annotations/2.3.2/error_prone_annotations-2.3.2.jar b/tools/lib/external/com/google/errorprone/error_prone_annotations/2.3.2/error_prone_annotations-2.3.2.jar
deleted file mode 100755
index bc2584d..0000000
--- a/tools/lib/external/com/google/errorprone/error_prone_annotations/2.3.2/error_prone_annotations-2.3.2.jar
+++ /dev/null
Binary files differ
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
new file mode 100755
index 0000000..c9bea2a
--- /dev/null
+++ b/tools/lib/external/com/google/errorprone/error_prone_annotations/2.3.4/error_prone_annotations-2.3.4.jar
Binary files differ
diff --git a/tools/lib/external/com/google/guava/guava/28.1-jre/guava-28.1-jre.jar b/tools/lib/external/com/google/guava/guava/28.1-jre/guava-28.1-jre.jar
deleted file mode 100755
index 081cd11..0000000
--- a/tools/lib/external/com/google/guava/guava/28.1-jre/guava-28.1-jre.jar
+++ /dev/null
Binary files differ
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
new file mode 100755
index 0000000..4244e8a
--- /dev/null
+++ b/tools/lib/external/com/google/guava/guava/30.1-jre/guava-30.1-jre.jar
Binary files differ
diff --git a/tools/lib/external/com/sun/istack/istack-commons-runtime/3.0.7/istack-commons-runtime-3.0.7.jar b/tools/lib/external/com/sun/istack/istack-commons-runtime/3.0.7/istack-commons-runtime-3.0.7.jar
deleted file mode 100755
index 2fe5b82..0000000
--- a/tools/lib/external/com/sun/istack/istack-commons-runtime/3.0.7/istack-commons-runtime-3.0.7.jar
+++ /dev/null
Binary files differ
diff --git a/tools/lib/external/com/sun/istack/istack-commons-runtime/3.0.8/istack-commons-runtime-3.0.8.jar b/tools/lib/external/com/sun/istack/istack-commons-runtime/3.0.8/istack-commons-runtime-3.0.8.jar
new file mode 100755
index 0000000..8f37e95
--- /dev/null
+++ b/tools/lib/external/com/sun/istack/istack-commons-runtime/3.0.8/istack-commons-runtime-3.0.8.jar
Binary files differ
diff --git a/tools/lib/external/com/sun/xml/fastinfoset/FastInfoset/1.2.15/FastInfoset-1.2.15.jar b/tools/lib/external/com/sun/xml/fastinfoset/FastInfoset/1.2.15/FastInfoset-1.2.15.jar
deleted file mode 100755
index 2671209..0000000
--- a/tools/lib/external/com/sun/xml/fastinfoset/FastInfoset/1.2.15/FastInfoset-1.2.15.jar
+++ /dev/null
Binary files differ
diff --git a/tools/lib/external/com/sun/xml/fastinfoset/FastInfoset/1.2.16/FastInfoset-1.2.16.jar b/tools/lib/external/com/sun/xml/fastinfoset/FastInfoset/1.2.16/FastInfoset-1.2.16.jar
new file mode 100755
index 0000000..6e91f1c
--- /dev/null
+++ b/tools/lib/external/com/sun/xml/fastinfoset/FastInfoset/1.2.16/FastInfoset-1.2.16.jar
Binary files differ
diff --git a/tools/lib/external/jakarta/activation/jakarta.activation-api/1.2.1/jakarta.activation-api-1.2.1.jar b/tools/lib/external/jakarta/activation/jakarta.activation-api/1.2.1/jakarta.activation-api-1.2.1.jar
new file mode 100755
index 0000000..bbfb52f
--- /dev/null
+++ b/tools/lib/external/jakarta/activation/jakarta.activation-api/1.2.1/jakarta.activation-api-1.2.1.jar
Binary files differ
diff --git a/tools/lib/external/jakarta/xml/bind/jakarta.xml.bind-api/2.3.2/jakarta.xml.bind-api-2.3.2.jar b/tools/lib/external/jakarta/xml/bind/jakarta.xml.bind-api/2.3.2/jakarta.xml.bind-api-2.3.2.jar
new file mode 100755
index 0000000..b16236d
--- /dev/null
+++ b/tools/lib/external/jakarta/xml/bind/jakarta.xml.bind-api/2.3.2/jakarta.xml.bind-api-2.3.2.jar
Binary files differ
diff --git a/tools/lib/external/javax/activation/javax.activation-api/1.2.0/javax.activation-api-1.2.0.jar b/tools/lib/external/javax/activation/javax.activation-api/1.2.0/javax.activation-api-1.2.0.jar
deleted file mode 100755
index 986c365..0000000
--- a/tools/lib/external/javax/activation/javax.activation-api/1.2.0/javax.activation-api-1.2.0.jar
+++ /dev/null
Binary files differ
diff --git a/tools/lib/external/javax/xml/bind/jaxb-api/2.3.1/jaxb-api-2.3.1.jar b/tools/lib/external/javax/xml/bind/jaxb-api/2.3.1/jaxb-api-2.3.1.jar
deleted file mode 100755
index 4565865..0000000
--- a/tools/lib/external/javax/xml/bind/jaxb-api/2.3.1/jaxb-api-2.3.1.jar
+++ /dev/null
Binary files differ
diff --git a/tools/lib/external/kotlin-plugin-ij/Kotlin/kotlinc/lib/kotlin-stdlib.jar b/tools/lib/external/kotlin-plugin-ij/Kotlin/kotlinc/lib/kotlin-stdlib.jar
index b2dd457..c952c24 100755
--- a/tools/lib/external/kotlin-plugin-ij/Kotlin/kotlinc/lib/kotlin-stdlib.jar
+++ b/tools/lib/external/kotlin-plugin-ij/Kotlin/kotlinc/lib/kotlin-stdlib.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-all.jar
index 2bfb8f6..4890ddf 100755
--- a/tools/lib/external/lint-psi/intellij-core/intellij-core-all.jar
+++ b/tools/lib/external/lint-psi/intellij-core/intellij-core-all.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
index 585e85c..7c96f11 100755
--- a/tools/lib/external/lint-psi/kotlin-compiler/kotlin-compiler-all.jar
+++ b/tools/lib/external/lint-psi/kotlin-compiler/kotlin-compiler-all.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
index c163b73..636bb5f 100755
--- a/tools/lib/external/lint-psi/uast/uast-all.jar
+++ b/tools/lib/external/lint-psi/uast/uast-all.jar
Binary files differ
diff --git a/tools/lib/external/net/java/dev/jna/jna-platform/5.6.0/jna-platform-5.6.0.jar b/tools/lib/external/net/java/dev/jna/jna-platform/5.6.0/jna-platform-5.6.0.jar
new file mode 100755
index 0000000..91b2635
--- /dev/null
+++ b/tools/lib/external/net/java/dev/jna/jna-platform/5.6.0/jna-platform-5.6.0.jar
Binary files differ
diff --git a/tools/lib/external/net/java/dev/jna/jna/5.6.0/jna-5.6.0.jar b/tools/lib/external/net/java/dev/jna/jna/5.6.0/jna-5.6.0.jar
new file mode 100755
index 0000000..fda5aa4
--- /dev/null
+++ b/tools/lib/external/net/java/dev/jna/jna/5.6.0/jna-5.6.0.jar
Binary files differ
diff --git a/tools/lib/external/org/apache/commons/commons-compress/1.12/commons-compress-1.12.jar b/tools/lib/external/org/apache/commons/commons-compress/1.12/commons-compress-1.12.jar
deleted file mode 100755
index 4867705..0000000
--- a/tools/lib/external/org/apache/commons/commons-compress/1.12/commons-compress-1.12.jar
+++ /dev/null
Binary files differ
diff --git a/tools/lib/external/org/apache/commons/commons-compress/1.20/commons-compress-1.20.jar b/tools/lib/external/org/apache/commons/commons-compress/1.20/commons-compress-1.20.jar
new file mode 100755
index 0000000..17c1c7b
--- /dev/null
+++ b/tools/lib/external/org/apache/commons/commons-compress/1.20/commons-compress-1.20.jar
Binary files differ
diff --git a/tools/lib/external/org/checkerframework/checker-qual/2.8.1/checker-qual-2.8.1.jar b/tools/lib/external/org/checkerframework/checker-qual/2.8.1/checker-qual-2.8.1.jar
deleted file mode 100755
index 09269be..0000000
--- a/tools/lib/external/org/checkerframework/checker-qual/2.8.1/checker-qual-2.8.1.jar
+++ /dev/null
Binary files differ
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.5.0/checker-qual-3.5.0.jar
new file mode 100755
index 0000000..f98cde8
--- /dev/null
+++ b/tools/lib/external/org/checkerframework/checker-qual/3.5.0/checker-qual-3.5.0.jar
Binary files differ
diff --git a/tools/lib/external/org/codehaus/mojo/animal-sniffer-annotations/1.18/animal-sniffer-annotations-1.18.jar b/tools/lib/external/org/codehaus/mojo/animal-sniffer-annotations/1.18/animal-sniffer-annotations-1.18.jar
deleted file mode 100755
index 3925273..0000000
--- a/tools/lib/external/org/codehaus/mojo/animal-sniffer-annotations/1.18/animal-sniffer-annotations-1.18.jar
+++ /dev/null
Binary files differ
diff --git a/tools/lib/external/org/glassfish/jaxb/jaxb-runtime/2.3.1/jaxb-runtime-2.3.1.jar b/tools/lib/external/org/glassfish/jaxb/jaxb-runtime/2.3.1/jaxb-runtime-2.3.1.jar
deleted file mode 100755
index 0b9ef67..0000000
--- a/tools/lib/external/org/glassfish/jaxb/jaxb-runtime/2.3.1/jaxb-runtime-2.3.1.jar
+++ /dev/null
Binary files differ
diff --git a/tools/lib/external/org/glassfish/jaxb/jaxb-runtime/2.3.2/jaxb-runtime-2.3.2.jar b/tools/lib/external/org/glassfish/jaxb/jaxb-runtime/2.3.2/jaxb-runtime-2.3.2.jar
new file mode 100755
index 0000000..62f8719
--- /dev/null
+++ b/tools/lib/external/org/glassfish/jaxb/jaxb-runtime/2.3.2/jaxb-runtime-2.3.2.jar
Binary files differ
diff --git a/tools/lib/external/org/glassfish/jaxb/txw2/2.3.1/txw2-2.3.1.jar b/tools/lib/external/org/glassfish/jaxb/txw2/2.3.1/txw2-2.3.1.jar
deleted file mode 100755
index 75ed519..0000000
--- a/tools/lib/external/org/glassfish/jaxb/txw2/2.3.1/txw2-2.3.1.jar
+++ /dev/null
Binary files differ
diff --git a/tools/lib/external/org/glassfish/jaxb/txw2/2.3.2/txw2-2.3.2.jar b/tools/lib/external/org/glassfish/jaxb/txw2/2.3.2/txw2-2.3.2.jar
new file mode 100755
index 0000000..0d5ac01
--- /dev/null
+++ b/tools/lib/external/org/glassfish/jaxb/txw2/2.3.2/txw2-2.3.2.jar
Binary files differ
diff --git a/tools/lib/external/org/jetbrains/trove4j/trove4j/20160824/trove4j-20160824.jar b/tools/lib/external/org/jetbrains/intellij/deps/trove4j/1.0.20181211/trove4j-1.0.20181211.jar
similarity index 82%
rename from tools/lib/external/org/jetbrains/trove4j/trove4j/20160824/trove4j-20160824.jar
rename to tools/lib/external/org/jetbrains/intellij/deps/trove4j/1.0.20181211/trove4j-1.0.20181211.jar
index 6bbf9e9..2c6d9ff 100755
--- a/tools/lib/external/org/jetbrains/trove4j/trove4j/20160824/trove4j-20160824.jar
+++ b/tools/lib/external/org/jetbrains/intellij/deps/trove4j/1.0.20181211/trove4j-1.0.20181211.jar
Binary files differ
diff --git a/tools/lib/external/org/jetbrains/kotlin/kotlin-reflect/1.3.72/kotlin-reflect-1.3.72.jar b/tools/lib/external/org/jetbrains/kotlin/kotlin-reflect/1.3.72/kotlin-reflect-1.3.72.jar
deleted file mode 100755
index 331116c..0000000
--- a/tools/lib/external/org/jetbrains/kotlin/kotlin-reflect/1.3.72/kotlin-reflect-1.3.72.jar
+++ /dev/null
Binary files differ
diff --git a/tools/lib/external/org/jetbrains/kotlin/kotlin-reflect/1.4.32/kotlin-reflect-1.4.32.jar b/tools/lib/external/org/jetbrains/kotlin/kotlin-reflect/1.4.32/kotlin-reflect-1.4.32.jar
new file mode 100755
index 0000000..8a5eab5
--- /dev/null
+++ b/tools/lib/external/org/jetbrains/kotlin/kotlin-reflect/1.4.32/kotlin-reflect-1.4.32.jar
Binary files differ
diff --git a/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib-common/1.3.72/kotlin-stdlib-common-1.3.72.jar b/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib-common/1.3.72/kotlin-stdlib-common-1.3.72.jar
deleted file mode 100755
index c7e2fe8..0000000
--- a/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib-common/1.3.72/kotlin-stdlib-common-1.3.72.jar
+++ /dev/null
Binary files differ
diff --git a/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib-common/1.4.32/kotlin-stdlib-common-1.4.32.jar b/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib-common/1.4.32/kotlin-stdlib-common-1.4.32.jar
new file mode 100755
index 0000000..a5fa896
--- /dev/null
+++ b/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib-common/1.4.32/kotlin-stdlib-common-1.4.32.jar
Binary files differ
diff --git a/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.3.72/kotlin-stdlib-jdk7-1.3.72.jar b/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.3.72/kotlin-stdlib-jdk7-1.3.72.jar
deleted file mode 100755
index 9a5ca5a..0000000
--- a/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.3.72/kotlin-stdlib-jdk7-1.3.72.jar
+++ /dev/null
Binary files differ
diff --git a/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.4.32/kotlin-stdlib-jdk7-1.4.32.jar b/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.4.32/kotlin-stdlib-jdk7-1.4.32.jar
new file mode 100755
index 0000000..5f74b05
--- /dev/null
+++ b/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.4.32/kotlin-stdlib-jdk7-1.4.32.jar
Binary files differ
diff --git a/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.3.72/kotlin-stdlib-jdk8-1.3.72.jar b/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.3.72/kotlin-stdlib-jdk8-1.3.72.jar
deleted file mode 100755
index 6adc87a..0000000
--- a/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.3.72/kotlin-stdlib-jdk8-1.3.72.jar
+++ /dev/null
Binary files differ
diff --git a/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.4.32/kotlin-stdlib-jdk8-1.4.32.jar b/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.4.32/kotlin-stdlib-jdk8-1.4.32.jar
new file mode 100755
index 0000000..efa0edf
--- /dev/null
+++ b/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.4.32/kotlin-stdlib-jdk8-1.4.32.jar
Binary files differ
diff --git a/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib/1.3.72/kotlin-stdlib-1.3.72.jar b/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib/1.3.72/kotlin-stdlib-1.3.72.jar
deleted file mode 100755
index 7007da0..0000000
--- a/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib/1.3.72/kotlin-stdlib-1.3.72.jar
+++ /dev/null
Binary files differ
diff --git a/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib/1.4.32/kotlin-stdlib-1.4.32.jar b/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib/1.4.32/kotlin-stdlib-1.4.32.jar
new file mode 100755
index 0000000..f478780
--- /dev/null
+++ b/tools/lib/external/org/jetbrains/kotlin/kotlin-stdlib/1.4.32/kotlin-stdlib-1.4.32.jar
Binary files differ
diff --git a/tools/lib/external/org/jetbrains/kotlinx/kotlinx-cli-jvm/0.3.1/kotlinx-cli-jvm-0.3.1.jar b/tools/lib/external/org/jetbrains/kotlinx/kotlinx-cli-jvm/0.3.1/kotlinx-cli-jvm-0.3.1.jar
new file mode 100755
index 0000000..9b93814
--- /dev/null
+++ b/tools/lib/external/org/jetbrains/kotlinx/kotlinx-cli-jvm/0.3.1/kotlinx-cli-jvm-0.3.1.jar
Binary files differ
diff --git a/tools/lib/external/org/jvnet/staxex/stax-ex/1.8.1/stax-ex-1.8.1.jar b/tools/lib/external/org/jvnet/staxex/stax-ex/1.8.1/stax-ex-1.8.1.jar
new file mode 100755
index 0000000..a200db5
--- /dev/null
+++ b/tools/lib/external/org/jvnet/staxex/stax-ex/1.8.1/stax-ex-1.8.1.jar
Binary files differ
diff --git a/tools/lib/external/org/jvnet/staxex/stax-ex/1.8/stax-ex-1.8.jar b/tools/lib/external/org/jvnet/staxex/stax-ex/1.8/stax-ex-1.8.jar
deleted file mode 100755
index 5e60637..0000000
--- a/tools/lib/external/org/jvnet/staxex/stax-ex/1.8/stax-ex-1.8.jar
+++ /dev/null
Binary files differ
diff --git a/tools/lib/external/org/ow2/asm/asm-analysis/7.0/asm-analysis-7.0.jar b/tools/lib/external/org/ow2/asm/asm-analysis/7.0/asm-analysis-7.0.jar
deleted file mode 100755
index 341d0c5..0000000
--- a/tools/lib/external/org/ow2/asm/asm-analysis/7.0/asm-analysis-7.0.jar
+++ /dev/null
Binary files differ
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.1/asm-analysis-9.1.jar
new file mode 100755
index 0000000..f97d124
--- /dev/null
+++ b/tools/lib/external/org/ow2/asm/asm-analysis/9.1/asm-analysis-9.1.jar
Binary files differ
diff --git a/tools/lib/external/org/ow2/asm/asm-tree/7.0/asm-tree-7.0.jar b/tools/lib/external/org/ow2/asm/asm-tree/7.0/asm-tree-7.0.jar
deleted file mode 100755
index 243c3cb..0000000
--- a/tools/lib/external/org/ow2/asm/asm-tree/7.0/asm-tree-7.0.jar
+++ /dev/null
Binary files differ
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.1/asm-tree-9.1.jar
new file mode 100755
index 0000000..0375862
--- /dev/null
+++ b/tools/lib/external/org/ow2/asm/asm-tree/9.1/asm-tree-9.1.jar
Binary files differ
diff --git a/tools/lib/external/org/ow2/asm/asm/7.0/asm-7.0.jar b/tools/lib/external/org/ow2/asm/asm/7.0/asm-7.0.jar
deleted file mode 100755
index 2cf38f4..0000000
--- a/tools/lib/external/org/ow2/asm/asm/7.0/asm-7.0.jar
+++ /dev/null
Binary files differ
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.1/asm-9.1.jar
new file mode 100755
index 0000000..8238019
--- /dev/null
+++ b/tools/lib/external/org/ow2/asm/asm/9.1/asm-9.1.jar
Binary files differ
diff --git a/tools/lib/external/xerces/xercesImpl/2.12.0/xercesImpl-2.12.0.jar b/tools/lib/external/xerces/xercesImpl/2.12.0/xercesImpl-2.12.0.jar
new file mode 100755
index 0000000..b69d01d
--- /dev/null
+++ b/tools/lib/external/xerces/xercesImpl/2.12.0/xercesImpl-2.12.0.jar
Binary files differ
diff --git a/tools/lib/external/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01.jar b/tools/lib/external/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01.jar
new file mode 100755
index 0000000..4673346
--- /dev/null
+++ b/tools/lib/external/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01.jar
Binary files differ
diff --git a/tools/lib/layoutlib-api/layoutlib-api.jar b/tools/lib/layoutlib-api/layoutlib-api.jar
index 0e3e9f7..f9230a9 100755
--- a/tools/lib/layoutlib-api/layoutlib-api.jar
+++ b/tools/lib/layoutlib-api/layoutlib-api.jar
Binary files differ
diff --git a/tools/lib/lint-classpath.jar b/tools/lib/lint-classpath.jar
index 87519b3..3b31cfd 100755
--- a/tools/lib/lint-classpath.jar
+++ b/tools/lib/lint-classpath.jar
Binary files differ
diff --git a/tools/lib/lint/cli/libcli.jar b/tools/lib/lint/cli/libcli.jar
index 5d9a833..c91d892 100755
--- a/tools/lib/lint/cli/libcli.jar
+++ b/tools/lib/lint/cli/libcli.jar
Binary files differ
diff --git a/tools/lib/lint/lint-api.jar b/tools/lib/lint/lint-api.jar
index 66d4b6c..6957b33 100755
--- a/tools/lib/lint/lint-api.jar
+++ b/tools/lib/lint/lint-api.jar
Binary files differ
diff --git a/tools/lib/lint/lint-checks.jar b/tools/lib/lint/lint-checks.jar
index 47c655c..604bf20 100755
--- a/tools/lib/lint/lint-checks.jar
+++ b/tools/lib/lint/lint-checks.jar
Binary files differ
diff --git a/tools/lib/lint/lint-model.jar b/tools/lib/lint/lint-model.jar
index a71e8d0..1f24b26 100755
--- a/tools/lib/lint/lint-model.jar
+++ b/tools/lib/lint/lint-model.jar
Binary files differ
diff --git a/tools/lib/misc/screenshot2/libscreenshot2lib.jar b/tools/lib/misc/screenshot2/libscreenshot2lib.jar
index 889f263..cb479ed 100755
--- a/tools/lib/misc/screenshot2/libscreenshot2lib.jar
+++ b/tools/lib/misc/screenshot2/libscreenshot2lib.jar
Binary files differ
diff --git a/tools/lib/profgen-classpath.jar b/tools/lib/profgen-classpath.jar
new file mode 100755
index 0000000..f75bffd
--- /dev/null
+++ 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
new file mode 100755
index 0000000..aea79a1
--- /dev/null
+++ 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
new file mode 100755
index 0000000..2be927c
--- /dev/null
+++ b/tools/lib/profgen/profgen/libprofgen.jar
Binary files differ
diff --git a/tools/lib/r8.jar b/tools/lib/r8.jar
new file mode 100755
index 0000000..bf0ddfc
--- /dev/null
+++ b/tools/lib/r8.jar
Binary files differ
diff --git a/tools/lib/repository/repository.jar b/tools/lib/repository/repository.jar
index 8c6aade..0dc8af8 100755
--- a/tools/lib/repository/repository.jar
+++ b/tools/lib/repository/repository.jar
Binary files differ
diff --git a/tools/lib/retrace-classpath.jar b/tools/lib/retrace-classpath.jar
new file mode 100755
index 0000000..7ec0306
--- /dev/null
+++ b/tools/lib/retrace-classpath.jar
Binary files differ
diff --git a/tools/lib/screenshot2-classpath.jar b/tools/lib/screenshot2-classpath.jar
index d33ca3f..f6bdddb 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
index 269beb2..ee10f88 100755
--- a/tools/lib/sdk-common/sdk-common.jar
+++ b/tools/lib/sdk-common/sdk-common.jar
Binary files differ
diff --git a/tools/lib/sdklib/libavdmanager_lib.jar b/tools/lib/sdklib/libavdmanager_lib.jar
index f9d9f1d..ebe1b20 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 0a78931..9f08801 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/sdklib.jar
index 2439865..2101cb6 100755
--- a/tools/lib/sdklib/sdklib.jar
+++ b/tools/lib/sdklib/sdklib.jar
Binary files differ
diff --git a/tools/lib/sdkmanager-classpath.jar b/tools/lib/sdkmanager-classpath.jar
index de8a13b..424e962 100755
--- a/tools/lib/sdkmanager-classpath.jar
+++ b/tools/lib/sdkmanager-classpath.jar
Binary files differ
diff --git a/tools/source.properties b/tools/source.properties
index 61f02e1..52fcab7 100755
--- a/tools/source.properties
+++ b/tools/source.properties
@@ -1,3 +1,3 @@
-Pkg.Revision=3.0
-Pkg.Path=cmdline-tools;3.0
+Pkg.Revision=3.0-dev
+Pkg.Path=cmdline-tools;3.0-dev
Pkg.Desc=Android SDK Command-line Tools
