Convert google-api-java-client-min-repackaged to Android.bp
See build/soong/README.md for more information.
Also delete 1.20.0, there are no references to it.
Test: m checkbuild
Change-Id: I9fcec9ec75681358844553343a35802e6db60f06
diff --git a/common/google-api-java-client/1.20.0/Android.mk b/common/google-api-java-client/1.20.0/Android.mk
deleted file mode 100644
index 3e128f2..0000000
--- a/common/google-api-java-client/1.20.0/Android.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Copyright (C) 2017 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := \
- google-api-java-client-min-repackaged-1.20.0:google-api-java-client-min-repackaged-1.20.0.jar
-
-include $(BUILD_HOST_PREBUILT)
-
diff --git a/common/google-api-java-client/1.20.0/BUILD b/common/google-api-java-client/1.20.0/BUILD
deleted file mode 100644
index 65a1ca5..0000000
--- a/common/google-api-java-client/1.20.0/BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-java_import(
- name = "google-api-java-client-min-repackaged-1.20.0",
- jars = ["google-api-java-client-min-repackaged-1.20.0.jar"],
- tags = ["managed"],
- visibility = ["//visibility:public"],
-)
diff --git a/common/google-api-java-client/1.20.0/HOWTO.txt b/common/google-api-java-client/1.20.0/HOWTO.txt
deleted file mode 100644
index 6e914e2..0000000
--- a/common/google-api-java-client/1.20.0/HOWTO.txt
+++ /dev/null
@@ -1,95 +0,0 @@
-How to recreate this JAR
-
-=========================================================
-
-Download the latest google-api-java-client library from
-https://developers.google.com/api-client-library/java/google-api-java-client/download
-
-Download jarjar from
-https://code.google.com/p/jarjar/
-
-Install Apache Ant (if not already installed)
-
-=========================================================
-
-Create the following directory structure
-
-base/
- |-- jars/
- |-- lib/
- \-- build.xml
-
-=========================================================
-
-Put the jarjar-<version>.jar in base/lib
-
-Extract and place the .jar files from the client lib you want in base/jars
-for 1.20.0 we
-
-INCLUDED
-+ commons-logging-1.1.1.jar
-+ google-api-client-1.20.0.jar
-+ google-api-client-jackson2-1.20.0.jar
-+ google-api-client-java6-1.20.0.jar
-+ google-http-client-1.20.0.jar
-+ google-http-client-jackson2-1.20.0.jar
-+ google-oauth-client-1.20.0.jar
-+ google-oauth-client-java6-1.20.0.jar
-+ google-oauth-client-jetty-1.20.0.jar
-+ httpclient-4.0.1.jar
-+ httpcore-4.0.1.jar
-+ jackson-core-2.1.3.jar
-+ jetty-6.1.26.jar
-+ jetty-util-6.1.26.jar
-+ jsr305-1.3.9.jar
-
-and EXCLUDED
-- google-api-client-android-1.20.0.jar
-- google-api-client-appengine-1.20.0.jar
-- google-api-client-gson-1.20.0.jar
-- google-api-client-protobuf-1.20.0.jar
-- google-api-client-servlet-1.20.0.jar
-- google-api-client-xml-1.20.0.jar
-- google-http-client-android-1.20.0.jar
-- google-http-client-appengine-1.20.0.jar
-- google-http-client-gson-1.20.0.jar
-- google-http-client-jackson-1.20.0.jar
-- google-http-client-jdo-1.20.0.jar
-- google-http-client-protobuf-1.20.0.jar
-- google-http-client-xml-1.20.0.jar
-- google-oauth-client-appengine-1.20.0.jar
-- google-oauth-client-servlet-1.20.0.jar
-- guava-jdk5-13.0.jar
-- gson-2.1.jar
-- jackson-core-asl-1.9.11.jar
-- jdo2-api-2.3-eb.jar
-- protobuf-java-2.4.1.jar
-- transaction-api-1.1.jar
-- xpp3-1.1.4c.jar
-
-=========================================================
-
-create a build.xml
-
-<project name="gapiRepackage">
- <target name="jar">
- <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="lib/jarjar-1.4.jar"/>
- <jarjar jarfile="dist/google-api-java-client-min-repackaged-1.20.0.jar">
- <zipgroupfileset dir="jars" includes="*.jar"/>
- <rule pattern="org.apache.**" result="com.google.api.client.repackaged.@0"/>
- <rule pattern="com.google.gson.**" result="com.google.api.client.repackaged.@0"/>
- <rule pattern="com.google.protobuf.**" result="com.google.api.client.repackaged.@0"/>
- <rule pattern="com.fasterxml.**" result="com.google.api.client.repackaged.@0"/>
- <rule pattern="org.codehaus.**" result="com.google.api.client.repackaged.@0"/>
- <rule pattern="org.mortbay.**" result="com.google.api.client.repackaged.@0"/>
- <rule pattern="org.xmlpull.**" result="com.google.api.client.repackaged.@0"/>
- <rule pattern="javax.annotation.**" result="com.google.api.client.repackaged.@0"/>
- <rule pattern="javax.xml.**" result="com.google.api.client.repackaged.@0"/>
- </jarjar>
- </target>
-</project>
-
-=========================================================
-
-run "ant jar" to create a combined, reduced, repackaged jar.
-it will be found as base/dist/google-api-java-client-min-repackaged-1.20.0.jar
diff --git a/common/google-api-java-client/1.20.0/LICENSE.txt b/common/google-api-java-client/1.20.0/LICENSE.txt
deleted file mode 100644
index d645695..0000000
--- a/common/google-api-java-client/1.20.0/LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
- 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
-
- 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.
diff --git a/common/google-api-java-client/1.20.0/NOTICE.txt b/common/google-api-java-client/1.20.0/NOTICE.txt
deleted file mode 100644
index d645695..0000000
--- a/common/google-api-java-client/1.20.0/NOTICE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
- 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
-
- 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.
diff --git a/common/google-api-java-client/1.20.0/README.txt b/common/google-api-java-client/1.20.0/README.txt
deleted file mode 100644
index 45ee587..0000000
--- a/common/google-api-java-client/1.20.0/README.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-Google Api Java Client libraries (LICENSE.txt)
-Reduced and Repackaged with JarJar
-
-https://developers.google.com/api-client-library/java/google-api-java-client/download
-
-========================================
-Included Jars
-========================================
-commons-logging-1.1.1.jar
-google-api-client-1.20.0.jar
-google-api-client-jackson2-1.20.0.jar
-google-api-client-java6-1.20.0.jar
-google-http-client-1.20.0.jar
-google-http-client-jackson2-1.20.0.jar
-google-oauth-client-1.20.0.jar
-google-oauth-client-java6-1.20.0.jar
-google-oauth-client-jetty-1.20.0.jar
-httpclient-4.0.1.jar
-httpcore-4.0.1.jar
-jackson-core-2.1.3.jar
-jetty-6.1.26.jar
-jetty-util-6.1.26.jar
-jsr305-1.3.9.jar
-
-========================================
-Included jars with modified packages
-========================================
-Package name prefixed with "com.google.api.client.repackaged"
-
-commons-logging-1.1.1.jar
-jackson
-httpclient-4.0.1.jar
-httpcore-4.0.1.jar
-jackson-core-2.1.3.jar
-jetty-6.1.26.jar
-jetty-util-6.1.26.jar
-jsr305-1.3.9.jar
-
-========================================
-Licensing information
-========================================
-Apache Software License, Version 2.0 (NOTICE.txt)
-- commons-logging-1.1.1.jar
-- google-api-client-1.20.0.jar
-- google-api-client-gson-1.20.0.jar
-- google-api-client-jackson2-1.20.0.jar
-- google-api-client-java6-1.20.0.jar
-- google-http-client-1.20.0.jar
-- google-http-client-jackson2-1.20.0.jar
-- google-oauth-client-1.20.0.jar
-- google-oauth-client-java6-1.20.0.jar
-- google-oauth-client-jetty-1.20.0.jar
-- httpclient-4.0.1.jar
-- httpcore-4.0.1.jar
-- jackson-core-2.1.3.jar
-- jetty-6.1.26.jar
-- jetty-util-6.1.26.jar
-- jsr305-1.3.9.jar
diff --git a/common/google-api-java-client/1.20.0/google-api-java-client-min-repackaged-1.20.0.jar b/common/google-api-java-client/1.20.0/google-api-java-client-min-repackaged-1.20.0.jar
deleted file mode 100644
index 2288313..0000000
--- a/common/google-api-java-client/1.20.0/google-api-java-client-min-repackaged-1.20.0.jar
+++ /dev/null
Binary files differ
diff --git a/common/google-api-java-client/1.23.0/Android.bp b/common/google-api-java-client/1.23.0/Android.bp
new file mode 100644
index 0000000..817f1d7
--- /dev/null
+++ b/common/google-api-java-client/1.23.0/Android.bp
@@ -0,0 +1,20 @@
+//
+// Copyright (C) 2017 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.
+//
+
+java_import_host {
+ name: "google-api-java-client-min-repackaged",
+ jars: ["google-api-java-client-min-repackaged-1.23.0.jar"],
+}
diff --git a/common/google-api-java-client/1.23.0/Android.mk b/common/google-api-java-client/1.23.0/Android.mk
deleted file mode 100644
index 2f0818a..0000000
--- a/common/google-api-java-client/1.23.0/Android.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Copyright (C) 2017 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := \
- google-api-java-client-min-repackaged:google-api-java-client-min-repackaged-1.23.0.jar
-
-include $(BUILD_HOST_PREBUILT)
-
