Fix build with mozc master

Author: wengxt

CMakeLists.txt

@@ -40,7 +40,6 @@ add_subdirectory(dictionary)
 add_subdirectory(data_manager)
 add_subdirectory(rewriter)
 add_subdirectory(storage)
-add_subdirectory(usage_stats)
 add_subdirectory(ipc)
 add_subdirectory(client)
 add_subdirectory(transliteration)

converter/CMakeLists.txt

@@ -1,21 +1,27 @@
 mozc_library(history_reconstructor.cc DEPENDS mozc::protocol::protocol mozc::dictionary::pos_matcher mozc::base::util mozc::converter::segments)
-mozc_library(segments.cc DEPENDS absl::log absl::check mozc::base::vlog)
+mozc_library(segments.cc DEPENDS
+    absl::log absl::check mozc::base::vlog
+    mozc::converter::candidate
+    )
 mozc_library(reverse_converter.cc DEPENDS mozc::protocol::protocol mozc::converter::segments mozc::base::util mozc::composer::composer)
 mozc_library(converter.cc DEPENDS
     mozc::protocol::protocol
     mozc::converter::history_reconstructor
     mozc::converter::reverse_converter
-    mozc::dictionary::suppression_dictionary
-    mozc::usage_stats::usage_stats)
+    mozc::dictionary::suppression_dictionary)
 mozc_library(key_corrector.cc DEPENDS
     mozc::protocol::protocol
     mozc::base::util
     mozc::base::vlog)
 mozc_library(lattice.cc DEPENDS
         mozc::base::singleton absl::log absl::check)
-mozc_library(node_list_builder.cc DEPENDS
+mozc_library(candidate.cc DEPENDS
     mozc::protocol::protocol
-)
+    mozc::base::vlog
+    mozc::base::number_util
+    mozc::base::util
+    mozc::prediction::suggestion_filter
+    mozc::dictionary::suppression_dictionary)
 
 mozc_library(candidate_filter.cc DEPENDS
     mozc::protocol::protocol
@@ -39,8 +45,7 @@ mozc_library(immutable_converter.cc DEPENDS
     mozc::converter::segments
     mozc::converter::segmenter
     mozc::converter::connector
-    mozc::converter::nbest_generator
-    mozc::converter::node_list_builder)
+    mozc::converter::nbest_generator)
 mozc_library(connector.cc DEPENDS absl::log absl::check absl::statusor mozc::storage::louds::louds)
 mozc_library(segmenter.cc DEPENDS absl::log absl::check)
 mozc_library(gen_segmenter_bitarray.cc DEPENDS mozc::protocol::segmenter_data_pb mozc::base::file_stream)

dictionary/CMakeLists.txt

@@ -104,7 +104,6 @@ mozc_library(user_dictionary.cc
         mozc::dictionary::user_dictionary_util 
         mozc::dictionary::user_dictionary_storage
         mozc::dictionary::suppression_dictionary 
-        mozc::usage_stats::usage_stats
 )
 mozc_library(text_dictionary_loader.cc DEPENDS
     mozc::dictionary::pos_matcher

engine/CMakeLists.txt

@@ -21,9 +21,28 @@ mozc_library(engine.cc DEPENDS
     mozc::converter::converter
     mozc::engine::minimal_converter
     mozc::engine::data_loader
+    mozc::engine::engine_converter
     mozc::prediction::predictor
     mozc::converter::immutable_converter
     mozc::prediction::dictionary_predictor
     mozc::rewriter::rewriter
     mozc::dictionary::user_dictionary_session_handler
 )
+
+mozc_library(candidate_list.cc DEPENDS
+    absl::raw_hash_set
+    absl::log
+    mozc::base::hash)
+mozc_library(engine_output.cc DEPENDS
+    mozc::protocol::protocol
+    mozc::engine::candidate_list
+    mozc::base::text_normalizer
+    mozc::converter::segments
+    mozc::composer::composer)
+mozc_library(engine_converter.cc DEPENDS
+    mozc::protocol::protocol
+    mozc::engine::candidate_list
+    mozc::converter::segments
+    mozc::base::util
+    mozc::composer::composer
+    mozc::engine::engine_output)

fcitx/CMakeLists.txt

@@ -28,7 +28,6 @@ if (ENABLE_SERVER)
 else()
     target_sources(fcitx5-mozc PRIVATE ${MOZC_SOURCE_DIR}/unix/fcitx5/mozc_direct_client.cc)
     target_link_libraries(fcitx5-mozc
-        mozc::session::session_usage_observer
         mozc::engine::engine
         mozc::session::key_info_util
         mozc::session::session_handler

gui/config_dialog/CMakeLists.txt

@@ -52,7 +52,7 @@ target_link_libraries(config_dialog
     mozc::protocol::protocol
     mozc::base::system_util
     mozc::base::config_file_stream
-    mozc::session::internal::keymap
+    mozc::session::keymap
     mozc::gui::base
     mozc::client::client
     mozc::config::stats_config_util

mozc

@@ -7,7 +7,6 @@ mozc_library(user_history_predictor.cc DEPENDS
     mozc::base::hash
     mozc::composer::composer
     mozc::converter::segments
-    mozc::usage_stats::usage_stats
     mozc::base::config_file_stream
     mozc::storage::encrypted_string_storage
     mozc::rewriter::variants_rewriter
@@ -36,7 +35,6 @@ mozc_library(dictionary_prediction_aggregator.cc DEPENDS
     mozc::base::util
     mozc::base::number_util
     mozc::converter::segments
-    mozc::converter::node_list_builder
     mozc::composer::composer
     mozc::prediction::result
     mozc::prediction::number_decoder
@@ -52,7 +50,6 @@ mozc_library(dictionary_predictor.cc DEPENDS
     mozc::converter::segmenter
     mozc::prediction::suggestion_filter
     mozc::prediction::result
-    mozc::usage_stats::usage_stats
     mozc::dictionary::single_kanji_dictionary
     mozc::prediction::dictionary_prediction_aggregator)
 mozc_library(predictor.cc DEPENDS

prediction/CMakeLists.txt

@@ -55,7 +55,6 @@ mozc_library(rewriter.cc
     mozc::composer::composer
     mozc::data_manager::data_manager
     mozc::data_manager::serialized_dictionary
-    mozc::usage_stats::usage_stats
     mozc::storage::lru_storage
     mozc::storage::existence_filter
     mozc::dictionary::single_kanji_dictionary

rewriter/CMakeLists.txt

@@ -1,36 +1,5 @@
-mozc_library(key_info_util.cc DEPENDS mozc::protocol::protocol mozc::composer::composer mozc::session::internal::keymap)
-mozc_library(internal/keymap.cc DEPENDS mozc::protocol::protocol mozc::composer::composer)
-mozc_library(session_usage_observer.cc DEPENDS
-    mozc::protocol::protocol
-    mozc::usage_stats::usage_stats
-    mozc::config::stats_config_util
-    mozc::base::clock
-    mozc::base::vlog)
-mozc_library(session_usage_stats_util.cc DEPENDS
-    mozc::protocol::protocol
-    mozc::base::util
-    mozc::usage_stats::usage_stats)
-mozc_library(session_observer_handler.cc DEPENDS
-    mozc::protocol::protocol)
-mozc_library(internal/candidate_list.cc DEPENDS
-    absl::raw_hash_set
-    absl::log
-    mozc::base::hash)
-mozc_library(internal/session_output.cc DEPENDS
-    mozc::protocol::protocol
-    mozc::session::internal::candidate_list
-    mozc::base::text_normalizer
-    mozc::converter::segments
-    mozc::composer::composer)
-mozc_library(session_converter.cc DEPENDS
-    mozc::protocol::protocol
-    mozc::usage_stats::usage_stats
-    mozc::session::internal::candidate_list
-    mozc::converter::segments
-    mozc::base::util
-    mozc::composer::composer
-    mozc::session::internal::session_output
-    mozc::session::session_usage_stats_util)
+mozc_library(key_info_util.cc DEPENDS mozc::protocol::protocol mozc::composer::composer mozc::session::keymap)
+mozc_library(keymap.cc DEPENDS mozc::protocol::protocol mozc::composer::composer)
 mozc_library(session_watch_dog.cc DEPENDS
     absl::log
     absl::check
@@ -41,36 +10,31 @@ mozc_library(session_watch_dog.cc DEPENDS
     mozc::base::system_util)
 mozc_library(session.cc
     SOURCES
-    internal/ime_context.cc
-    internal/key_event_transformer.cc
+        key_event_transformer.cc
+        ime_context.cc
     DEPENDS
         mozc::protocol::protocol
-        mozc::session::session_converter
-        mozc::session::session_usage_stats_util
-        mozc::usage_stats::usage_stats
+        mozc::engine::engine_converter
         mozc::transliteration::transliteration
-        mozc::session::internal::keymap
-        mozc::session::internal::candidate_list
-        mozc::session::internal::session_output)
+        mozc::session::keymap
+        mozc::engine::candidate_list
+        mozc::engine::engine_output)
 mozc_library(session_handler.cc DEPENDS
     absl::raw_hash_set
     absl::random_random
     absl::flags
     mozc::protocol::protocol
     mozc::config::config_handler
-    mozc::usage_stats::usage_stats
     mozc::config::character_form_manager
     mozc::base::process
     mozc::composer::composer
-    mozc::session::internal::keymap
+    mozc::session::keymap
     mozc::session::session
-    mozc::session::session_observer_handler
     mozc::session::session_watch_dog
     mozc::dictionary::user_dictionary_session_handler
     mozc::base::stopwatch )
 mozc_library(session_server.cc DEPENDS
     mozc::data_manager::oss::oss_data_manager
-    mozc::session::session_usage_observer
     mozc::session::session_handler
     mozc::protocol::protocol
     mozc::ipc::named_event

session/CMakeLists.txt

@@ -1,10 +1,3 @@
-mozc_library(tiny_storage.cc DEPENDS
-    absl::log
-    absl::check
-    mozc::base::file_util
-    mozc::base::file_stream
-    mozc::base::vlog)
-mozc_library(registry.cc DEPENDS absl::log mozc::storage::tiny_storage mozc::base::system_util mozc::base::singleton)
 mozc_library(lru_storage.cc DEPENDS absl::raw_hash_set absl::statusor absl::log mozc::base::file_stream mozc::base::hash mozc::base::clock mozc::base::mmap mozc::base::vlog mozc::base::file_util)
 mozc_library(louds/louds.cc
     SOURCES