diff options
author | Bob Badour <bbadour@google.com> | 2021-03-26 18:07:03 -0700 |
---|---|---|
committer | Bob Badour <bbadour@google.com> | 2021-03-26 18:07:03 -0700 |
commit | 7504dccdbe1ac0e30b37048ef9905324bbd4264a (patch) | |
tree | 1621fe2af7130a214be82e41b58c2b401ffc162b | |
parent | 19898ae400aa068af37ff754a9ebe7e801707fdd (diff) | |
download | GeoTZ-7504dccdbe1ac0e30b37048ef9905324bbd4264a.tar.gz |
[LSC] Add LOCAL_LICENSE_KINDS to packages/modules/GeoTZ
Added SPDX-license-identifier-Apache-2.0 to:
apex/com.android.geotz/Android.bp
common/Android.bp
geotz_lookup/Android.bp
locationtzprovider/Android.bp
s2storage/Android.bp
s2storage/tools/Android.bp
validation/geonames/Android.bp
Added SPDX-license-identifier-Apache-2.0 legacy_restricted to:
Android.bp
data_pipeline/Android.bp
Added legacy_restricted to:
output_data/Android.bp
Bug: 68860345
Bug: 151177513
Bug: 151953481
Test: m all
Exempt-From-Owner-Approval: janitorial work
Change-Id: Ie4314ba0191fcb86193869efcf13cbdb50520ca9
-rw-r--r-- | Android.bp | 42 | ||||
-rw-r--r-- | apex/com.android.geotz/Android.bp | 5 | ||||
-rw-r--r-- | common/Android.bp | 4 | ||||
-rw-r--r-- | data_pipeline/Android.bp | 10 | ||||
-rw-r--r-- | geotz_lookup/Android.bp | 4 | ||||
-rw-r--r-- | locationtzprovider/Android.bp | 4 | ||||
-rw-r--r-- | output_data/Android.bp | 9 | ||||
-rw-r--r-- | s2storage/Android.bp | 5 | ||||
-rw-r--r-- | s2storage/tools/Android.bp | 4 | ||||
-rw-r--r-- | validation/geonames/Android.bp | 5 |
10 files changed, 89 insertions, 3 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..0664c30 --- /dev/null +++ b/Android.bp @@ -0,0 +1,42 @@ +// +// 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: ["packages_modules_GeoTZ_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: "packages_modules_GeoTZ_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + "legacy_restricted", + ], + // large-scale-change unable to identify any license_text files +} diff --git a/apex/com.android.geotz/Android.bp b/apex/com.android.geotz/Android.bp index ae08a2e..2c063d3 100644 --- a/apex/com.android.geotz/Android.bp +++ b/apex/com.android.geotz/Android.bp @@ -13,6 +13,10 @@ // limitations under the License. // Defaults shared between real and test versions of the APEX. +package { + default_applicable_licenses: ["Android-Apache-2.0"], +} + apex_defaults { name: "com.android.geotz-defaults", updatable: true, @@ -70,4 +74,3 @@ java_library { "com.android.geotz", ], } - diff --git a/common/Android.bp b/common/Android.bp index 35818d4..b9dbf7b 100644 --- a/common/Android.bp +++ b/common/Android.bp @@ -13,6 +13,10 @@ // limitations under the License. // A library containing common code within the geolocation dir. +package { + default_applicable_licenses: ["Android-Apache-2.0"], +} + java_library_host { name: "geotz_common", srcs: ["src/main/java/**/*.java"], diff --git a/data_pipeline/Android.bp b/data_pipeline/Android.bp index a6a4e41..63c58e0 100644 --- a/data_pipeline/Android.bp +++ b/data_pipeline/Android.bp @@ -13,6 +13,16 @@ // limitations under the License. // Proto library +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "packages_modules_GeoTZ_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + // legacy_restricted + default_applicable_licenses: ["packages_modules_GeoTZ_license"], +} + java_library_host { name: "geotz_data_pipeline_protos", proto: { diff --git a/geotz_lookup/Android.bp b/geotz_lookup/Android.bp index e2bfec3..2e8e9c8 100644 --- a/geotz_lookup/Android.bp +++ b/geotz_lookup/Android.bp @@ -13,6 +13,10 @@ // limitations under the License. // A library for use on device or host to lookup time zones for a location. +package { + default_applicable_licenses: ["Android-Apache-2.0"], +} + java_library { name: "geotz_lookup", srcs: ["src/main/java/**/*.java"], diff --git a/locationtzprovider/Android.bp b/locationtzprovider/Android.bp index 9c3c4b5..60a3ecc 100644 --- a/locationtzprovider/Android.bp +++ b/locationtzprovider/Android.bp @@ -14,6 +14,10 @@ // A library that can be incorporated into an Application to provide an Offline // LocationTimeZoneProvider service. +package { + default_applicable_licenses: ["Android-Apache-2.0"], +} + java_library { name: "offlinelocationtimezoneprovider", srcs: ["src/main/java/**/*.java"], diff --git a/output_data/Android.bp b/output_data/Android.bp index cd923f1..177a6f7 100644 --- a/output_data/Android.bp +++ b/output_data/Android.bp @@ -13,6 +13,15 @@ // limitations under the License. // The tzs2.dat file containing time zone geo data for inclusion in the tzdata APEX file. +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "packages_modules_GeoTZ_license" + // to get the below license kinds: + // legacy_restricted + default_applicable_licenses: ["packages_modules_GeoTZ_license"], +} + prebuilt_etc { name: "apex_tzs2.dat", src: "odbl/tzs2.dat", diff --git a/s2storage/Android.bp b/s2storage/Android.bp index ddab97f..f4be5ca 100644 --- a/s2storage/Android.bp +++ b/s2storage/Android.bp @@ -13,6 +13,10 @@ // limitations under the License. // Library for read-only access to TZ S2 data files. +package { + default_applicable_licenses: ["Android-Apache-2.0"], +} + java_library { name: "geotz_s2storage_ro", sdk_version: "current", @@ -52,4 +56,3 @@ java_test_host { unit_test: true, }, } - diff --git a/s2storage/tools/Android.bp b/s2storage/tools/Android.bp index c4cb16e..4e5e20c 100644 --- a/s2storage/tools/Android.bp +++ b/s2storage/tools/Android.bp @@ -12,6 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. +package { + default_applicable_licenses: ["Android-Apache-2.0"], +} + java_library_host { name: "geotz_s2storage_tools", srcs: [ diff --git a/validation/geonames/Android.bp b/validation/geonames/Android.bp index a8cbdcf..67a28bf 100644 --- a/validation/geonames/Android.bp +++ b/validation/geonames/Android.bp @@ -13,6 +13,10 @@ // limitations under the License. // Proto library +package { + default_applicable_licenses: ["Android-Apache-2.0"], +} + java_library_host { name: "geotz_validation_protos", proto: { @@ -36,4 +40,3 @@ java_binary_host { "tzids", ], } - |