aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Android.bp17
-rw-r--r--common/Android.bp9
-rw-r--r--java/Android.bp19
-rw-r--r--native/dicttoolkit/Android.bp9
-rw-r--r--native/jni/Android.bp13
-rw-r--r--native/jni/tests/dictionary/utils/format_utils_test.cpp12
-rw-r--r--tests/Android.bp9
-rw-r--r--tools/EditTextVariations/Android.bp9
-rw-r--r--tools/dicttool/Android.bp9
-rw-r--r--tools/make-keyboard-text/Android.bp9
10 files changed, 111 insertions, 4 deletions
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 7419ed1fe..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: [
@@ -179,7 +188,9 @@ cc_library_static {
cc_test {
name: "liblatinime_unittests",
host_supported: true,
-
+ test_options: {
+ unit_test: true,
+ },
cflags: [
"-Wno-unused-parameter",
"-Wno-unused-function",
diff --git a/native/jni/tests/dictionary/utils/format_utils_test.cpp b/native/jni/tests/dictionary/utils/format_utils_test.cpp
index 3561bda30..34defe78c 100644
--- a/native/jni/tests/dictionary/utils/format_utils_test.cpp
+++ b/native/jni/tests/dictionary/utils/format_utils_test.cpp
@@ -57,7 +57,13 @@ TEST(FormatUtilsTest, TestDetectFormatVersion) {
{
const std::vector<uint8_t> buffer =
getBuffer(FormatUtils::MAGIC_NUMBER, FormatUtils::VERSION_2, 0, 0);
- EXPECT_EQ(FormatUtils::VERSION_2, FormatUtils::detectFormatVersion(
+ EXPECT_EQ(FormatUtils::UNKNOWN_VERSION, FormatUtils::detectFormatVersion(
+ ReadOnlyByteArrayView(buffer.data(), buffer.size())));
+ }
+ {
+ const std::vector<uint8_t> buffer =
+ getBuffer(FormatUtils::MAGIC_NUMBER, FormatUtils::VERSION_202, 0, 0);
+ EXPECT_EQ(FormatUtils::VERSION_202, FormatUtils::detectFormatVersion(
ReadOnlyByteArrayView(buffer.data(), buffer.size())));
}
{
@@ -75,7 +81,7 @@ TEST(FormatUtilsTest, TestDetectFormatVersion) {
{
const std::vector<uint8_t> buffer =
- getBuffer(FormatUtils::MAGIC_NUMBER - 1, FormatUtils::VERSION_2, 0, 0);
+ getBuffer(FormatUtils::MAGIC_NUMBER - 1, FormatUtils::VERSION_402, 0, 0);
EXPECT_EQ(FormatUtils::UNKNOWN_VERSION, FormatUtils::detectFormatVersion(
ReadOnlyByteArrayView(buffer.data(), buffer.size())));
}
@@ -87,7 +93,7 @@ TEST(FormatUtilsTest, TestDetectFormatVersion) {
}
{
const std::vector<uint8_t> buffer =
- getBuffer(FormatUtils::MAGIC_NUMBER, FormatUtils::VERSION_2, 0, 0);
+ getBuffer(FormatUtils::MAGIC_NUMBER, FormatUtils::VERSION_402, 0, 0);
EXPECT_EQ(FormatUtils::UNKNOWN_VERSION, FormatUtils::detectFormatVersion(
ReadOnlyByteArrayView(buffer.data(), buffer.size() - 1)));
}
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",
generated by cgit v1.2.3-83-g751a (git 2.47.1) at 2025-05-07 23:31:40 +0000