Update license definitions under art/

All the GPL code under art/ is in art/dt_fd_forward, art/openjdkjvm
or art/openjdkvmti, which have their own license files, so remove
GPL from the top level licenses.

The modules in Android.mk are phony modules with no code of their
own, so set the licenses to Apache 2.0.

All the files in art/dt_fd_forward, art/openjdkjvm and art/openjdkvmti
are annotated with the classpath exception, so remove GPL from their
license list, leaving GPL with classpath exception.

Test: none
Change-Id: I9b213110f69820a96f28e9e5f84414dcd33b8a58

5 files changed, 6 insertions, 24 deletions

diff --git a/Android.bp b/Android.bp
index 338bc69f27..83d72d1bcc 100644
--- a/Android.bp
+++ b/Android.bp
@@ -5,27 +5,12 @@ package {
     default_applicable_licenses: ["art_license"],
 }
 
-// Added automatically by a large-scale-change that took the approach of
-// 'apply every license found to every target'. While this makes sure we respect
-// every license restriction, it may not be entirely correct.
-//
-// e.g. GPL in an MIT project might only apply to the contrib/ directory.
-//
-// Please consider splitting the single license below into multiple licenses,
-// taking care not to lose any license_kind information, and overriding the
-// default license using the 'licenses: [...]' property on targets as needed.
-//
-// For unused files, consider creating a 'fileGroup' with "//visibility:private"
-// to attach the license to, and including a comment whether the files may be
-// used in the current project.
-// See: http://go/android-license-faq
 license {
     name: "art_license",
     visibility: [":__subpackages__"],
     license_kinds: [
         "SPDX-license-identifier-Apache-2.0",
         "SPDX-license-identifier-BSD",
-        "SPDX-license-identifier-GPL-2.0",
     ],
     license_text: [
         "NOTICE",
diff --git a/Android.mk b/Android.mk
index 58f1aecc20..aa33c08779 100644
--- a/Android.mk
+++ b/Android.mk
@@ -62,8 +62,8 @@ include $(art_path)/build/Android.cpplint.mk
 ifneq ($(HOST_OS),darwin)
 include $(CLEAR_VARS)
 LOCAL_MODULE := art-tools
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD SPDX-license-identifier-GPL-2.0
-LOCAL_LICENSE_CONDITIONS := notice restricted
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE
 LOCAL_IS_HOST_MODULE := true
 
@@ -388,8 +388,8 @@ art_apex_manifest_file :=
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := art-runtime
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD SPDX-license-identifier-GPL-2.0
-LOCAL_LICENSE_CONDITIONS := notice restricted
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE
 
 # Reference the libraries and binaries in the appropriate APEX module, because
@@ -465,8 +465,8 @@ ifneq ($(HOST_OS),darwin)
 ifeq ($(ART_BUILD_HOST_DEBUG),true)
 include $(CLEAR_VARS)
 LOCAL_MODULE := art-libartd-libopenjdkd-host-dependency
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD SPDX-license-identifier-GPL-2.0
-LOCAL_LICENSE_CONDITIONS := notice restricted
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE
 LOCAL_MULTILIB := both
 LOCAL_REQUIRED_MODULES := libopenjdkd
diff --git a/dt_fd_forward/Android.bp b/dt_fd_forward/Android.bp
index dd321ffe4c..772b55eb06 100644
--- a/dt_fd_forward/Android.bp
+++ b/dt_fd_forward/Android.bp
@@ -39,7 +39,6 @@ license {
     visibility: [":__subpackages__"],
     license_kinds: [
         "SPDX-license-identifier-Apache-2.0",
-        "SPDX-license-identifier-GPL-2.0",
         "SPDX-license-identifier-GPL-with-classpath-exception",
     ],
     license_text: [
diff --git a/openjdkjvm/Android.bp b/openjdkjvm/Android.bp
index 99ab9e3457..2757d9d3b7 100644
--- a/openjdkjvm/Android.bp
+++ b/openjdkjvm/Android.bp
@@ -35,7 +35,6 @@ license {
     name: "art_openjdkjvm_license",
     visibility: [":__subpackages__"],
     license_kinds: [
-        "SPDX-license-identifier-GPL-2.0",
         "SPDX-license-identifier-GPL-with-classpath-exception",
     ],
     license_text: [
diff --git a/openjdkjvmti/Android.bp b/openjdkjvmti/Android.bp
index b1d5e8a5f0..4f49ae5fcb 100644
--- a/openjdkjvmti/Android.bp
+++ b/openjdkjvmti/Android.bp
@@ -36,7 +36,6 @@ license {
     visibility: [":__subpackages__"],
     license_kinds: [
         "SPDX-license-identifier-Apache-2.0",
-        "SPDX-license-identifier-GPL-2.0",
         "SPDX-license-identifier-GPL-with-classpath-exception",
     ],
     license_text: [