Skip to content

Commit

Permalink
Update license definitions under art/
Browse files Browse the repository at this point in the history
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
  • Loading branch information
colincross authored and Treehugger Robot committed Feb 1, 2022
1 parent e208b04 commit b81df96
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 24 deletions.
15 changes: 0 additions & 15 deletions Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
12 changes: 6 additions & 6 deletions Android.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion dt_fd_forward/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -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: [
Expand Down
1 change: 0 additions & 1 deletion openjdkjvm/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -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: [
Expand Down
1 change: 0 additions & 1 deletion openjdkjvmti/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -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: [
Expand Down

0 comments on commit b81df96

Please sign in to comment.