Commit 9da2eb81 authored by Peter Wen's avatar Peter Wen Committed by Commit Bot

Android: Clean up android_deps licenses

Commands used:
- `rm -rf third_party/android_deps/libs/[!O]*`
- `tools/android/roll/android_deps/fetch_all.py --update-all`

Added text license for GNU v2 with classpath exception since one dep
was downloading a full html page for it.

Bug: 900912
Change-Id: Ib3213d41259da0921e9d66cea2d08af2f29d383c
Reviewed-on: https://chromium-review.googlesource.com/c/1312563Reviewed-by: default avatarMohamed Heikal <mheikal@chromium.org>
Commit-Queue: Peter Wen <wnwen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#604636}
parent 19947f44
...@@ -3,8 +3,8 @@ Short Name: javapoet ...@@ -3,8 +3,8 @@ Short Name: javapoet
URL: http://github.com/square/javapoet/ URL: http://github.com/square/javapoet/
Version: 1.11.0 Version: 1.11.0
License: Apache 2.0 License: Apache 2.0
License File: NOT_SHIPPED License File: LICENSE
Security Critical: no Security Critical: yes
Description: Description:
Use beautiful Java code to generate beautiful Java code. Use beautiful Java code to generate beautiful Java code.
......
The Checker Framework
Copyright 2004-present by the Checker Framework developers
Most of the Checker Framework is licensed under the GNU General Public Most of the Checker Framework is licensed under the GNU General Public
License, version 2 (GPL2), with the classpath exception. The text of this License, version 2 (GPL2), with the classpath exception. The text of this
license appears below. This is the same license used for OpenJDK. license appears below. This is the same license used for OpenJDK.
......
...@@ -155,11 +155,15 @@ class ChromiumDepGraph { ...@@ -155,11 +155,15 @@ class ChromiumDepGraph {
private customizeDep(DependencyDescription dep) { private customizeDep(DependencyDescription dep) {
if (dep.id?.startsWith("com_google_android_")) { if (dep.id?.startsWith("com_google_android_")) {
dep.licenseUrl = "" dep.licenseUrl = ""
// This should match fetch_all._ANDROID_SDK_LICENSE_PATH // This should match fetch_all._ANDROID_SDK_LICENSE_PATH.
dep.licensePath = "licenses/Android_SDK_License-December_9_2016.txt" dep.licensePath = "licenses/Android_SDK_License-December_9_2016.txt"
if (dep.url?.isEmpty()) { if (dep.url?.isEmpty()) {
dep.url = "https://developers.google.com/android/guides/setup" dep.url = "https://developers.google.com/android/guides/setup"
} }
} else if (dep.licenseUrl?.equals("http://openjdk.java.net/legal/gplv2+ce.html")) {
// This avoids using html in a LICENSE file.
dep.licenseUrl = ""
dep.licensePath = "licenses/GNU_v2_with_Classpath_Exception_1991.txt"
} else if (dep.licenseName?.isEmpty()) { } else if (dep.licenseName?.isEmpty()) {
def fallbackProperties = FALLBACK_PROPERTIES.get(dep.id) def fallbackProperties = FALLBACK_PROPERTIES.get(dep.id)
if (fallbackProperties != null) { if (fallbackProperties != null) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment