Add LOCAL_LICENSE_KINDS to system/timezone
Added SPDX-license-identifier-Apache-2.0 to:
apex/Android.bp
apex/tests/Android.bp
debug_tools/host/Android.bp
distro/core/Android.bp
distro/installer/Android.bp
distro/tools/Android.bp
input_tools/android/common/Android.bp
input_tools/android/telephonylookup_generator/Android.bp
input_tools/android/tzids/Android.bp
input_tools/android/tzlookup_generator/Android.bp
input_tools/android/zone_compactor/Android.bp
tzdatacheck/Android.bp
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
SPDX-license-identifier-MIT SPDX-license-identifier-Unicode-DFS
to:
testing/Android.bp
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
SPDX-license-identifier-MIT SPDX-license-identifier-Unicode-DFS
legacy_notice legacy_unencumbered
to:
Android.bp
Added SPDX-license-identifier-BSD SPDX-license-identifier-MIT
SPDX-license-identifier-Unicode-DFS
to:
output_data/Android.bp
output_data/icu_overlay/Android.bp
output_data/icu_overlay/Android.mk
testing/data/test1/output_data/Android.bp
testing/data/test3/output_data/Android.bp
Added SPDX-license-identifier-BSD legacy_unencumbered
to:
output_data/iana/Android.bp
output_data/iana/Android.mk
Added legacy_notice
to:
output_data/android/Android.bp
output_data/android/Android.mk
output_data/version/Android.bp
output_data/version/Android.mk
testing/data/test1/apex/Android.bp
testing/data/test3/apex/Android.bp
Bug: 68860345
Bug: 151177513
Bug: 151953481
Test: m all
Exempt-From-Owner-Approval: janitorial work
Change-Id: Idc3700c14b9c4c7848aea87c9911288905ebb82a
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..e716011
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,46 @@
+//
+// Copyright (C) 2021 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.
+
+package {
+ default_applicable_licenses: ["system_timezone_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.
+// http://go/android-license-faq
+license {
+ name: "system_timezone_license",
+ visibility: [":__subpackages__"],
+ license_kinds: [
+ "SPDX-license-identifier-Apache-2.0",
+ "SPDX-license-identifier-BSD",
+ "SPDX-license-identifier-MIT",
+ "SPDX-license-identifier-Unicode-DFS",
+ "legacy_notice",
+ "legacy_unencumbered",
+ ],
+ // large-scale-change unable to identify any license_text files
+}
diff --git a/apex/Android.bp b/apex/Android.bp
index 4512679..9521f55 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -12,6 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+package {
+ // http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // the below license kinds from "system_timezone_license":
+ // SPDX-license-identifier-Apache-2.0
+ default_applicable_licenses: ["system_timezone_license"],
+}
+
// Defaults shared between real and test versions of the APEX.
apex_defaults {
name: "com.android.tzdata-defaults",
diff --git a/apex/tests/Android.bp b/apex/tests/Android.bp
index ef35edd..7677653 100644
--- a/apex/tests/Android.bp
+++ b/apex/tests/Android.bp
@@ -12,6 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+package {
+ // http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // the below license kinds from "system_timezone_license":
+ // SPDX-license-identifier-Apache-2.0
+ default_applicable_licenses: ["system_timezone_license"],
+}
+
android_test {
name: "MtsTimeZoneDataTestCases",
@@ -32,4 +40,3 @@
],
min_sdk_version: "29",
}
-
diff --git a/debug_tools/host/Android.bp b/debug_tools/host/Android.bp
index d144633..bcad93d 100644
--- a/debug_tools/host/Android.bp
+++ b/debug_tools/host/Android.bp
@@ -12,6 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+package {
+ // http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // the below license kinds from "system_timezone_license":
+ // SPDX-license-identifier-Apache-2.0
+ default_applicable_licenses: ["system_timezone_license"],
+}
+
java_library_host {
name: "timezone_host_debug_tools",
srcs: ["main/java/**/*.java"],
diff --git a/distro/core/Android.bp b/distro/core/Android.bp
index efe7c0e..6bb2279 100644
--- a/distro/core/Android.bp
+++ b/distro/core/Android.bp
@@ -12,6 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+package {
+ // http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // the below license kinds from "system_timezone_license":
+ // SPDX-license-identifier-Apache-2.0
+ default_applicable_licenses: ["system_timezone_license"],
+}
+
// Library of classes for handling time zone distros. Used on-device for
// handling distros and within CTS tests.
//
diff --git a/distro/installer/Android.bp b/distro/installer/Android.bp
index 828d838..59a48ce 100644
--- a/distro/installer/Android.bp
+++ b/distro/installer/Android.bp
@@ -12,6 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+package {
+ // http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // the below license kinds from "system_timezone_license":
+ // SPDX-license-identifier-Apache-2.0
+ default_applicable_licenses: ["system_timezone_license"],
+}
+
// The classes needed to handle installation of time zone distros.
java_library {
name: "time_zone_distro_installer",
diff --git a/distro/tools/Android.bp b/distro/tools/Android.bp
index bfc07b7..02c195c 100644
--- a/distro/tools/Android.bp
+++ b/distro/tools/Android.bp
@@ -12,6 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+package {
+ // http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // the below license kinds from "system_timezone_license":
+ // SPDX-license-identifier-Apache-2.0
+ default_applicable_licenses: ["system_timezone_license"],
+}
+
// The tool used to create time zone distro.zip files.
java_binary_host {
name: "create_time_zone_distro",
diff --git a/input_tools/android/common/Android.bp b/input_tools/android/common/Android.bp
index a9b906b..da061ed 100644
--- a/input_tools/android/common/Android.bp
+++ b/input_tools/android/common/Android.bp
@@ -12,6 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+package {
+ // http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // the below license kinds from "system_timezone_license":
+ // SPDX-license-identifier-Apache-2.0
+ default_applicable_licenses: ["system_timezone_license"],
+}
// Code common to various time zone host tools.
java_library_host {
diff --git a/input_tools/android/telephonylookup_generator/Android.bp b/input_tools/android/telephonylookup_generator/Android.bp
index adf09dd..e2b24d4 100644
--- a/input_tools/android/telephonylookup_generator/Android.bp
+++ b/input_tools/android/telephonylookup_generator/Android.bp
@@ -12,6 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+package {
+ // http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // the below license kinds from "system_timezone_license":
+ // SPDX-license-identifier-Apache-2.0
+ default_applicable_licenses: ["system_timezone_license"],
+}
+
// Proto library
java_library_host {
name: "telephonylookupprotos",
diff --git a/input_tools/android/tzids/Android.bp b/input_tools/android/tzids/Android.bp
index a5656d0..676fdb1 100644
--- a/input_tools/android/tzids/Android.bp
+++ b/input_tools/android/tzids/Android.bp
@@ -12,6 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+package {
+ // http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // the below license kinds from "system_timezone_license":
+ // SPDX-license-identifier-Apache-2.0
+ default_applicable_licenses: ["system_timezone_license"],
+}
+
// Proto library
java_library_host {
name: "tzids_protos",
diff --git a/input_tools/android/tzlookup_generator/Android.bp b/input_tools/android/tzlookup_generator/Android.bp
index f29edfa..c8140a2 100644
--- a/input_tools/android/tzlookup_generator/Android.bp
+++ b/input_tools/android/tzlookup_generator/Android.bp
@@ -12,6 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+package {
+ // http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // the below license kinds from "system_timezone_license":
+ // SPDX-license-identifier-Apache-2.0
+ default_applicable_licenses: ["system_timezone_license"],
+}
+
// Proto library
java_library_host {
name: "countryzones_protos",
diff --git a/input_tools/android/zone_compactor/Android.bp b/input_tools/android/zone_compactor/Android.bp
index ace0bad..e4d37d0 100644
--- a/input_tools/android/zone_compactor/Android.bp
+++ b/input_tools/android/zone_compactor/Android.bp
@@ -12,6 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+package {
+ // http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // the below license kinds from "system_timezone_license":
+ // SPDX-license-identifier-Apache-2.0
+ default_applicable_licenses: ["system_timezone_license"],
+}
+
// A static library for the zone_compactor host tool.
// The tool can be run with java -jar zone_compactor.jar
java_binary_host {
@@ -19,4 +27,3 @@
main_class: "ZoneCompactor",
srcs: ["main/java/**/*.java"],
}
-
diff --git a/output_data/Android.bp b/output_data/Android.bp
index abe8e36..9b28c6a 100644
--- a/output_data/Android.bp
+++ b/output_data/Android.bp
@@ -12,6 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+package {
+ // http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // the below license kinds from "system_timezone_license":
+ // SPDX-license-identifier-BSD
+ // SPDX-license-identifier-MIT
+ // SPDX-license-identifier-Unicode-DFS
+ default_applicable_licenses: ["system_timezone_license"],
+}
+
prebuilt_etc {
name: "apex_tz_version",
src: "version/tz_version",
diff --git a/output_data/android/Android.bp b/output_data/android/Android.bp
index 8689c87..c3c5677 100644
--- a/output_data/android/Android.bp
+++ b/output_data/android/Android.bp
@@ -12,6 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+package {
+ // http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // the below license kinds from "system_timezone_license":
+ // legacy_notice
+ default_applicable_licenses: ["system_timezone_license"],
+}
+
// Module definition producing a tzlookup.xml prebuilt file in
// /system/etc/tzdata_module/etc/tz for standalone ART testing purposes.
// This is a temporary change needed until the ART Buildbot and Golem both
diff --git a/output_data/android/Android.mk b/output_data/android/Android.mk
index 27698ff..4698f42 100644
--- a/output_data/android/Android.mk
+++ b/output_data/android/Android.mk
@@ -22,6 +22,8 @@
# Simulate the time zone data module.
include $(CLEAR_VARS)
LOCAL_MODULE := tzlookup.xml_host_tzdata_apex
+LOCAL_LICENSE_KINDS := legacy_notice
+LOCAL_LICENSE_CONDITIONS := notice
LOCAL_IS_HOST_MODULE := true
LOCAL_SRC_FILES := tzlookup.xml
LOCAL_MODULE_CLASS := ETC
@@ -32,6 +34,8 @@
include $(CLEAR_VARS)
LOCAL_MODULE := telephonylookup.xml_host_tzdata_apex
+LOCAL_LICENSE_KINDS := legacy_notice
+LOCAL_LICENSE_CONDITIONS := notice
LOCAL_IS_HOST_MODULE := true
LOCAL_SRC_FILES := telephonylookup.xml
LOCAL_MODULE_CLASS := ETC
diff --git a/output_data/iana/Android.bp b/output_data/iana/Android.bp
index 2dd51b9..09ee9db 100644
--- a/output_data/iana/Android.bp
+++ b/output_data/iana/Android.bp
@@ -12,6 +12,36 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+package {
+ default_applicable_licenses: ["system_timezone_output_data_iana_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.
+// http://go/android-license-faq
+license {
+ name: "system_timezone_output_data_iana_license",
+ visibility: [":__subpackages__"],
+ license_kinds: [
+ "SPDX-license-identifier-BSD",
+ "legacy_unencumbered",
+ ],
+ license_text: [
+ "NOTICE",
+ ],
+}
+
// Build rules related to the tzdata file.
// tzdata is a binary file used by bionic functions like mktime / localtime and
// Android's implementation of java.util.TimeZone, ZoneInfoDb. Both these users
diff --git a/output_data/iana/Android.mk b/output_data/iana/Android.mk
index bb0530c..2be6924 100644
--- a/output_data/iana/Android.mk
+++ b/output_data/iana/Android.mk
@@ -22,6 +22,9 @@
# Simulate the time zone data module.
include $(CLEAR_VARS)
LOCAL_MODULE := tzdata_host_tzdata_apex
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD legacy_unencumbered
+LOCAL_LICENSE_CONDITIONS := notice unencumbered
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE
LOCAL_IS_HOST_MODULE := true
LOCAL_SRC_FILES := tzdata
LOCAL_MODULE_CLASS := ETC
diff --git a/output_data/icu_overlay/Android.bp b/output_data/icu_overlay/Android.bp
index bd2856d..8d88ffa 100644
--- a/output_data/icu_overlay/Android.bp
+++ b/output_data/icu_overlay/Android.bp
@@ -12,6 +12,39 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+package {
+ default_applicable_licenses: [
+ "system_timezone_output_data_icu_overlay_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.
+// http://go/android-license-faq
+license {
+ name: "system_timezone_output_data_icu_overlay_license",
+ visibility: [":__subpackages__"],
+ license_kinds: [
+ "SPDX-license-identifier-BSD",
+ "SPDX-license-identifier-MIT",
+ "SPDX-license-identifier-Unicode-DFS",
+ ],
+ license_text: [
+ "LICENSE",
+ ],
+}
+
// Module definition producing a tzdata prebuilt file in
// /system/etc/tzdata_module/etc/tz for standalone ART testing purposes.
// This is a temporary change needed until the ART Buildbot and Golem both fully
diff --git a/output_data/icu_overlay/Android.mk b/output_data/icu_overlay/Android.mk
index 17f8eee..67437eb 100644
--- a/output_data/icu_overlay/Android.mk
+++ b/output_data/icu_overlay/Android.mk
@@ -22,6 +22,9 @@
# Simulate the time zone data module.
include $(CLEAR_VARS)
LOCAL_MODULE := icu_tzdata.dat_host_tzdata_apex
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD SPDX-license-identifier-MIT SPDX-license-identifier-Unicode-DFS
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/LICENSE
LOCAL_IS_HOST_MODULE := true
LOCAL_SRC_FILES := icu_tzdata.dat
LOCAL_MODULE_CLASS := ETC
diff --git a/output_data/version/Android.bp b/output_data/version/Android.bp
index 8bf1efa..076d3cf 100644
--- a/output_data/version/Android.bp
+++ b/output_data/version/Android.bp
@@ -12,6 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+package {
+ // http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // the below license kinds from "system_timezone_license":
+ // legacy_notice
+ default_applicable_licenses: ["system_timezone_license"],
+}
+
prebuilt_usr_share {
name: "tz_version",
src: "tz_version",
diff --git a/output_data/version/Android.mk b/output_data/version/Android.mk
index b3b78f3..5c084a9 100644
--- a/output_data/version/Android.mk
+++ b/output_data/version/Android.mk
@@ -22,6 +22,8 @@
# Simulate the time zone data module
include $(CLEAR_VARS)
LOCAL_MODULE := tz_version_host_tzdata_apex
+LOCAL_LICENSE_KINDS := legacy_notice
+LOCAL_LICENSE_CONDITIONS := notice
LOCAL_IS_HOST_MODULE := true
LOCAL_SRC_FILES := tz_version
LOCAL_MODULE_CLASS := ETC
diff --git a/testing/Android.bp b/testing/Android.bp
index 75cc274..1e92676 100644
--- a/testing/Android.bp
+++ b/testing/Android.bp
@@ -12,6 +12,17 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+package {
+ // http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // the below license kinds from "system_timezone_license":
+ // SPDX-license-identifier-Apache-2.0
+ // SPDX-license-identifier-BSD
+ // SPDX-license-identifier-MIT
+ // SPDX-license-identifier-Unicode-DFS
+ default_applicable_licenses: ["system_timezone_license"],
+}
+
// Library of test-support classes for tzdata updates. Shared between CTS and other tests.
java_library_static {
name: "tzdata-testing",
diff --git a/testing/data/test1/apex/Android.bp b/testing/data/test1/apex/Android.bp
index c405f63..577f922 100644
--- a/testing/data/test1/apex/Android.bp
+++ b/testing/data/test1/apex/Android.bp
@@ -12,6 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+package {
+ // http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // the below license kinds from "system_timezone_license":
+ // legacy_notice
+ default_applicable_licenses: ["system_timezone_license"],
+}
+
// A test version of apex.tzdata that contains test1 data (2030a).
// It has a version code that should beat a "real" APEX and enables
// end-to-end installation testing on devices with the latests real
@@ -31,4 +39,3 @@
// image.
installable: false,
}
-
diff --git a/testing/data/test1/output_data/Android.bp b/testing/data/test1/output_data/Android.bp
index c1ac6ca..390ec90 100644
--- a/testing/data/test1/output_data/Android.bp
+++ b/testing/data/test1/output_data/Android.bp
@@ -12,6 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+package {
+ // http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // the below license kinds from "system_timezone_license":
+ // SPDX-license-identifier-BSD
+ // SPDX-license-identifier-MIT
+ // SPDX-license-identifier-Unicode-DFS
+ default_applicable_licenses: ["system_timezone_license"],
+}
+
prebuilt_etc {
name: "apex_tz_version_test1",
src: "version/tz_version",
@@ -53,4 +63,3 @@
sub_dir: "icu",
installable: false,
}
-
diff --git a/testing/data/test3/apex/Android.bp b/testing/data/test3/apex/Android.bp
index e4f9118..2ae27d7 100644
--- a/testing/data/test3/apex/Android.bp
+++ b/testing/data/test3/apex/Android.bp
@@ -12,6 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+package {
+ // http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // the below license kinds from "system_timezone_license":
+ // legacy_notice
+ default_applicable_licenses: ["system_timezone_license"],
+}
+
// A test version of apex.tzdata that contains corrupt data.
// It causes a boot loop on device, for the purposes of testing platform
// rollback mechanisms.
@@ -32,4 +40,3 @@
// image.
installable: false,
}
-
diff --git a/testing/data/test3/output_data/Android.bp b/testing/data/test3/output_data/Android.bp
index fd41850..3b70586 100644
--- a/testing/data/test3/output_data/Android.bp
+++ b/testing/data/test3/output_data/Android.bp
@@ -12,6 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+package {
+ // http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // the below license kinds from "system_timezone_license":
+ // SPDX-license-identifier-BSD
+ // SPDX-license-identifier-MIT
+ // SPDX-license-identifier-Unicode-DFS
+ default_applicable_licenses: ["system_timezone_license"],
+}
+
prebuilt_etc {
name: "apex_tz_version_test3",
src: "version/tz_version",
@@ -53,4 +63,3 @@
sub_dir: "icu",
installable: false,
}
-
diff --git a/tzdatacheck/Android.bp b/tzdatacheck/Android.bp
index 00ad141..14736bc 100644
--- a/tzdatacheck/Android.bp
+++ b/tzdatacheck/Android.bp
@@ -1,3 +1,11 @@
+package {
+ // http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // the below license kinds from "system_timezone_license":
+ // SPDX-license-identifier-Apache-2.0
+ default_applicable_licenses: ["system_timezone_license"],
+}
+
// ========================================================
// Executable
// ========================================================