From f3d9532a326833ec6e182dcb3eea3e5795c55954 Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Fri, 12 Feb 2021 14:48:59 -0800 Subject: [PATCH] [LSC] Add LOCAL_LICENSE_KINDS to packages/inputmethods/LatinIME Added SPDX-license-identifier-Apache-2.0 to: Android.bp common/Android.bp java/Android.bp native/dicttoolkit/Android.bp native/jni/Android.bp tests/Android.bp tools/EditTextVariations/Android.bp tools/dicttool/Android.bp tools/make-keyboard-text/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I440008bffac5c97a2497970af377a9d03262b6d8 --- Android.bp | 17 +++++++++++++++++ common/Android.bp | 9 +++++++++ java/Android.bp | 19 +++++++++++++++++++ native/dicttoolkit/Android.bp | 9 +++++++++ native/jni/Android.bp | 9 +++++++++ tests/Android.bp | 9 +++++++++ tools/EditTextVariations/Android.bp | 9 +++++++++ tools/dicttool/Android.bp | 9 +++++++++ tools/make-keyboard-text/Android.bp | 9 +++++++++ 9 files changed, 99 insertions(+) diff --git a/Android.bp b/Android.bp index 3abd6c19f..64845db05 100644 --- a/Android.bp +++ b/Android.bp @@ -12,6 +12,23 @@ // See the License for the specific language governing permissions and // limitations under the License. +package { + default_applicable_licenses: ["packages_inputmethods_LatinIME_license"], +} + +// Added automatically by a large-scale-change +// See: http://go/android-license-faq +license { + name: "packages_inputmethods_LatinIME_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + ], + license_text: [ + "NOTICE", + ], +} + filegroup { name: "dicttool_deps", srcs: [ diff --git a/common/Android.bp b/common/Android.bp index 925eef7fd..fd5512790 100644 --- a/common/Android.bp +++ b/common/Android.bp @@ -12,6 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "packages_inputmethods_LatinIME_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["packages_inputmethods_LatinIME_license"], +} + java_library { name: "latinime-common", host_supported: true, diff --git a/java/Android.bp b/java/Android.bp index f41e94af0..e3e644cf3 100644 --- a/java/Android.bp +++ b/java/Android.bp @@ -12,6 +12,25 @@ // See the License for the specific language governing permissions and // limitations under the License. +package { + default_applicable_licenses: [ + "packages_inputmethods_LatinIME_java_license", + ], +} + +// Added automatically by a large-scale-change +// See: http://go/android-license-faq +license { + name: "packages_inputmethods_LatinIME_java_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + ], + license_text: [ + "NOTICE", + ], +} + android_app { name: "LatinIME", diff --git a/native/dicttoolkit/Android.bp b/native/dicttoolkit/Android.bp index fd35697c1..4ae250fa2 100644 --- a/native/dicttoolkit/Android.bp +++ b/native/dicttoolkit/Android.bp @@ -12,6 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "packages_inputmethods_LatinIME_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["packages_inputmethods_LatinIME_license"], +} + cc_defaults { name: "dicttoolkit_defaults", diff --git a/native/jni/Android.bp b/native/jni/Android.bp index b522cb3bd..ab14632f8 100644 --- a/native/jni/Android.bp +++ b/native/jni/Android.bp @@ -12,6 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "packages_inputmethods_LatinIME_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["packages_inputmethods_LatinIME_license"], +} + filegroup { name: "LATIN_IME_CORE_SRC_FILES", srcs: [ diff --git a/tests/Android.bp b/tests/Android.bp index 76681f669..e1db354c3 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -12,6 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "packages_inputmethods_LatinIME_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["packages_inputmethods_LatinIME_license"], +} + android_test { name: "LatinIMETests", diff --git a/tools/EditTextVariations/Android.bp b/tools/EditTextVariations/Android.bp index 94b4951a7..f6ed1561d 100644 --- a/tools/EditTextVariations/Android.bp +++ b/tools/EditTextVariations/Android.bp @@ -12,6 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "packages_inputmethods_LatinIME_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["packages_inputmethods_LatinIME_license"], +} + android_test { name: "EditTextVariations", diff --git a/tools/dicttool/Android.bp b/tools/dicttool/Android.bp index 83b4ed32c..48f751e78 100644 --- a/tools/dicttool/Android.bp +++ b/tools/dicttool/Android.bp @@ -12,6 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "packages_inputmethods_LatinIME_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["packages_inputmethods_LatinIME_license"], +} + java_binary_host { name: "dicttool_aosp", diff --git a/tools/make-keyboard-text/Android.bp b/tools/make-keyboard-text/Android.bp index 4976051da..781f53f97 100644 --- a/tools/make-keyboard-text/Android.bp +++ b/tools/make-keyboard-text/Android.bp @@ -13,6 +13,15 @@ // See the License for the specific language governing permissions and // limitations under the License. +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "packages_inputmethods_LatinIME_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["packages_inputmethods_LatinIME_license"], +} + java_binary_host { name: "make-keyboard-text",