Merge branch 'google:master' into ubuntu

.github/workflows/android.yaml

@@ -30,7 +30,7 @@ jobs:
       - name: build
         working-directory: ./src
         run: |
-          bazel build --config oss_android package
+          bazel build --config oss_android package -c opt
 
       - name: upload artifacts
         uses: actions/upload-artifact@v4

.github/workflows/linux.yaml

@@ -37,7 +37,7 @@ jobs:
       - name: bazel build
         working-directory: ./src
         run: |
-          bazel build --config oss_linux package
+          bazel build --config oss_linux package -c opt
 
       - name: Upload Artifacts
         uses: actions/upload-artifact@v4
@@ -71,4 +71,4 @@ jobs:
       - name: bazel test
         working-directory: ./src
         run: |
-          bazel test ... --config oss_linux --build_tests_only
+          bazel test ... --config oss_linux --build_tests_only -c dbg

.github/workflows/macos.yaml

@@ -55,7 +55,7 @@ jobs:
       - name: bazel build
         working-directory: ./src
         run: |
-          bazel build --config oss_macos package --macos_cpus=arm64
+          bazel build --config oss_macos package --macos_cpus=arm64 -c opt
 
       - name: upload artifacts
         uses: actions/upload-artifact@v4
@@ -104,7 +104,7 @@ jobs:
       - name: bazel build
         working-directory: ./src
         run: |
-          bazel build --config oss_macos package --macos_cpus=x86_64
+          bazel build --config oss_macos package --macos_cpus=x86_64 -c opt
 
       - name: upload artifacts
         uses: actions/upload-artifact@v4
@@ -153,7 +153,7 @@ jobs:
       - name: bazel build
         working-directory: ./src
         run: |
-          bazel build --config oss_macos package --macos_cpus=x86_64,arm64
+          bazel build --config oss_macos package --macos_cpus=x86_64,arm64 -c opt
 
       - name: upload artifacts
         uses: actions/upload-artifact@v4
@@ -202,7 +202,7 @@ jobs:
       - name: bazel test
         working-directory: ./src
         run: |
-          bazel test ... --config oss_macos --build_tests_only
+          bazel test ... --config oss_macos --build_tests_only -c dbg
 
   # actions/cache works without this job, but having this would increase the likelihood of cache hit
   # in other jobs. Another approach would be to use "needs:".

src/BUILD.bazel

@@ -36,7 +36,7 @@ load(
     "mozc_select",
     "mozc_select_enable_neural_language_model",
     "mozc_select_enable_session_watchdog",
-    "mozc_select_enable_spellchecker",
+    "mozc_select_enable_supplemental_model",
     "mozc_select_enable_usage_rewriter",
 )
 load("//bazel:stubs.bzl", "bzl_library")
@@ -105,7 +105,7 @@ cc_library(
         ],
     ) + mozc_select_enable_session_watchdog(
         off = ["MOZC_DISABLE_SESSION_WATCHDOG"],
-    ) + mozc_select_enable_spellchecker([
+    ) + mozc_select_enable_supplemental_model([
     ]) + mozc_select_enable_usage_rewriter(
         off = ["NO_USAGE_REWRITER"],
     ) + mozc_select_enable_neural_language_model([

src/android/jni/BUILD.bazel

@@ -34,7 +34,13 @@
 # Usage:
 # % blaze --blazerc android/blazerc build --config=android_arm android/jni:libmozc.so
 
-load("//:build_defs.bzl", "MOZC_TAGS", "mozc_cc_library", "mozc_py_binary", "mozc_select")
+load(
+    "//:build_defs.bzl",
+    "MOZC_TAGS",
+    "mozc_cc_library",
+    "mozc_py_binary",
+    "mozc_select",
+)
 
 mozc_cc_library(
     name = "mozcjni",

src/base/vlog.cc

@@ -33,21 +33,13 @@
 #include <atomic>
 
 #include "absl/base/attributes.h"
-#include "absl/flags/flag.h"
-
-// Note that abseil HEAD has ABSL_LTS_RELEASE_VERSION undefined.
-#if !defined(ABSL_LTS_RELEASE_VERSION) || ABSL_LTS_RELEASE_VERSION >= 20240116
 #include "absl/flags/declare.h"
+#include "absl/flags/flag.h"
 #include "absl/log/flags.h"  // IWYU pragma: keep
-#endif                                   // ABSL_LTS_RELEASE_VERSION >= 20240116
 
-#if !defined(ABSL_LTS_RELEASE_VERSION) || ABSL_LTS_RELEASE_VERSION >= 20240116
-// Newer version of abseil defines --v flag. We rely on it to avoid symbol
-// name collision (though not recommended).
+// Abseil defines --v flag. We rely on it to avoid symbol name collision (though
+// not recommended).
 ABSL_DECLARE_FLAG(int, v);
-#else   // ABSL_LTS_RELEASE_VERSION >= 20240116
-ABSL_FLAG(int, v, 0, "Show all VLOG(m) messages for m <= this.");
-#endif  // ABSL_LTS_RELEASE_VERSION < 20240116
 
 namespace mozc::internal {
 

src/build_defs.bzl

@@ -428,7 +428,7 @@ def mozc_select_enable_session_watchdog(on = [], off = []):
         "//conditions:default": off,
     })
 
-def mozc_select_enable_spellchecker(on = [], off = []):
+def mozc_select_enable_supplemental_model(on = [], off = []):
     return select({
         "//:enable_spellchecker": on,
         "//conditions:default": off,

src/composer/BUILD.bazel

@@ -61,7 +61,6 @@ mozc_cc_library(
         "//composer/internal:transliterators",
         "//config:character_form_manager",
         "//config:config_handler",
-        "//engine:spellchecker_interface",
         "//protocol:commands_cc_proto",
         "//protocol:config_cc_proto",
         "//testing:friend_test",

src/composer/internal/BUILD.bazel

@@ -32,18 +32,12 @@ load(
     "mozc_cc_binary",
     "mozc_cc_library",
     "mozc_cc_test",
-    "mozc_py_binary",
 )
 
 package(default_visibility = [
     "//:__subpackages__",
 ])
 
-mozc_py_binary(
-    name = "gen_typing_model",
-    srcs = ["gen_typing_model.py"],
-)
-
 mozc_cc_library(
     name = "transliterator_interface",
     hdrs = ["transliterator_interface.h"],

src/converter/BUILD.bazel

@@ -34,7 +34,7 @@ load(
     "mozc_cc_test",
     "mozc_py_binary",
     "mozc_select_enable_neural_language_model",
-    "mozc_select_enable_spellchecker",
+    "mozc_select_enable_supplemental_model",
 )
 load("//bazel:stubs.bzl", "bzl_library")