Update build rules for protocol.

PiperOrigin-RevId: 595325711

src/android/jni/mozcjni.cc

@@ -35,7 +35,6 @@
 
 #include <memory>
 
-#include "protocol/commands.pb.h"
 #include "absl/random/random.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
@@ -48,6 +47,7 @@
 #include "engine/engine.h"
 #include "engine/engine_builder.h"
 #include "engine/minimal_engine.h"
+#include "protocol/commands.pb.h"
 #include "session/session_handler.h"
 #include "session/session_usage_observer.h"
 

src/client/client.cc

@@ -39,8 +39,6 @@
 #include <string>
 #include <vector>
 
-#include "protocol/commands.pb.h"
-#include "protocol/config.pb.h"
 #include "absl/base/attributes.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
@@ -57,6 +55,8 @@
 #include "client/client_interface.h"
 #include "config/config_handler.h"
 #include "ipc/ipc.h"
+#include "protocol/commands.pb.h"
+#include "protocol/config.pb.h"
 #include "session/key_info_util.h"
 
 #ifdef _WIN32

src/client/client.gyp

@@ -45,12 +45,12 @@
         '<(mozc_oss_src_dir)/base/base.gyp:version',
         '<(mozc_oss_src_dir)/config/config.gyp:config_handler',
         '<(mozc_oss_src_dir)/ipc/ipc.gyp:ipc',
-        '<(mozc_src_dir)/protocol/protocol.gyp:commands_proto',
-        '<(mozc_src_dir)/protocol/protocol.gyp:config_proto',
+        '<(mozc_oss_src_dir)/protocol/protocol.gyp:commands_proto',
+        '<(mozc_oss_src_dir)/protocol/protocol.gyp:config_proto',
         '<(mozc_oss_src_dir)/session/session_base.gyp:key_info_util',
       ],
       'export_dependent_settings': [
-        '<(mozc_src_dir)/protocol/protocol.gyp:commands_proto',
+        '<(mozc_oss_src_dir)/protocol/protocol.gyp:commands_proto',
       ],
     },
   ],

src/client/client.h

@@ -38,15 +38,15 @@
 #include <utility>
 #include <vector>
 
-#include "protocol/commands.pb.h"
-#include "protocol/config.pb.h"
 #include "absl/strings/string_view.h"
 #include "absl/time/time.h"
 #include "base/run_level.h"
 #include "base/strings/assign.h"
 #include "client/client_interface.h"
 #include "composer/key_event_util.h"
 #include "ipc/ipc.h"
+#include "protocol/commands.pb.h"
+#include "protocol/config.pb.h"
 #include "testing/gunit_prod.h"
 // for FRIEND_TEST()
 

src/client/client_interface.h

@@ -36,11 +36,11 @@
 #include <memory>
 #include <string>
 
-#include "protocol/commands.pb.h"
-#include "protocol/config.pb.h"
 #include "absl/strings/string_view.h"
 #include "absl/time/time.h"
 #include "ipc/ipc.h"
+#include "protocol/commands.pb.h"
+#include "protocol/config.pb.h"
 
 namespace mozc {
 

src/client/client_mock.h

@@ -33,11 +33,11 @@
 #include <memory>
 #include <string>
 
-#include "protocol/commands.pb.h"
-#include "protocol/config.pb.h"
 #include "absl/strings/string_view.h"
 #include "absl/time/time.h"
 #include "client/client_interface.h"
+#include "protocol/commands.pb.h"
+#include "protocol/config.pb.h"
 #include "testing/gmock.h"
 
 namespace mozc {

src/client/client_performance_test_main.cc

@@ -43,8 +43,6 @@
 #include <string>
 #include <vector>
 
-#include "protocol/commands.pb.h"
-#include "protocol/config.pb.h"
 #include "absl/algorithm/container.h"
 #include "absl/flags/flag.h"
 #include "absl/strings/str_format.h"
@@ -60,6 +58,8 @@
 #include "base/util.h"
 #include "client/client.h"
 #include "config/config_handler.h"
+#include "protocol/commands.pb.h"
+#include "protocol/config.pb.h"
 #include "session/random_keyevents_generator.h"
 
 ABSL_FLAG(std::string, server_path, "", "specify server path");

src/client/client_quality_test_main.cc

@@ -39,7 +39,6 @@
 #include <vector>
 
 #include "evaluation/scorer.h"
-#include "protocol/commands.pb.h"
 #include "absl/container/flat_hash_map.h"
 #include "absl/flags/flag.h"
 #include "absl/strings/str_join.h"
@@ -54,6 +53,7 @@
 #include "base/util.h"
 #include "base/vlog.h"
 #include "client/client.h"
+#include "protocol/commands.pb.h"
 
 ABSL_FLAG(std::string, server_path, "", "specify server path");
 ABSL_FLAG(std::string, log_path, "", "specify log output file path");

src/client/client_scenario_test_main.cc

@@ -39,8 +39,6 @@
 #include <string>
 #include <vector>
 
-#include "protocol/commands.pb.h"
-#include "protocol/renderer_command.pb.h"
 #include "absl/flags/flag.h"
 #include "absl/status/status.h"
 #include "absl/strings/match.h"
@@ -55,6 +53,8 @@
 #include "base/vlog.h"
 #include "client/client.h"
 #include "composer/key_parser.h"
+#include "protocol/commands.pb.h"
+#include "protocol/renderer_command.pb.h"
 #include "renderer/renderer_client.h"
 
 ABSL_FLAG(std::string, input, "", "Input file");

src/client/client_stress_test_main.cc

@@ -42,14 +42,14 @@
 #include <unistd.h>
 #endif  // _WIN32
 
-#include "protocol/renderer_command.pb.h"
 #include "absl/flags/flag.h"
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
 #include "base/init_mozc.h"
 #include "base/logging.h"
 #include "base/vlog.h"
 #include "client/client.h"
+#include "protocol/renderer_command.pb.h"
 #include "renderer/renderer_client.h"
 #include "session/random_keyevents_generator.h"
 

src/client/client_test.cc

@@ -35,8 +35,6 @@
 #include <utility>
 #include <vector>
 
-#include "protocol/commands.pb.h"
-#include "protocol/config.pb.h"
 #include "absl/container/flat_hash_map.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_join.h"
@@ -51,6 +49,8 @@
 #include "config/config_handler.h"
 #include "ipc/ipc.h"
 #include "ipc/ipc_mock.h"
+#include "protocol/commands.pb.h"
+#include "protocol/config.pb.h"
 #include "testing/gunit.h"
 
 namespace mozc {

src/composer/composer.cc

@@ -40,8 +40,6 @@
 #include <utility>
 #include <vector>
 
-#include "protocol/commands.pb.h"
-#include "protocol/config.pb.h"
 #include "spelling/spellchecker_service_interface.h"
 #include "absl/strings/match.h"
 #include "absl/strings/string_view.h"
@@ -61,6 +59,8 @@
 #include "composer/table.h"
 #include "config/character_form_manager.h"
 #include "config/config_handler.h"
+#include "protocol/commands.pb.h"
+#include "protocol/config.pb.h"
 #include "transliteration/transliteration.h"
 
 namespace mozc {

src/composer/composer.gyp

@@ -60,8 +60,8 @@
         '<(mozc_oss_src_dir)/config/config.gyp:character_form_manager',
         '<(mozc_oss_src_dir)/config/config.gyp:config_handler',
         '<(mozc_oss_src_dir)/protobuf/protobuf.gyp:protobuf',
-        '<(mozc_src_dir)/protocol/protocol.gyp:commands_proto',
-        '<(mozc_src_dir)/protocol/protocol.gyp:config_proto',
+        '<(mozc_oss_src_dir)/protocol/protocol.gyp:commands_proto',
+        '<(mozc_oss_src_dir)/protocol/protocol.gyp:config_proto',
         '<(mozc_oss_src_dir)/transliteration/transliteration.gyp:transliteration',
       ],
     },
@@ -73,7 +73,7 @@
       ],
       'dependencies': [
         '<(mozc_oss_src_dir)/base/base.gyp:base',
-        '<(mozc_src_dir)/protocol/protocol.gyp:commands_proto',
+        '<(mozc_oss_src_dir)/protocol/protocol.gyp:commands_proto',
       ],
     },
     {
@@ -85,8 +85,8 @@
       'dependencies': [
         '<(mozc_oss_src_dir)/base/absl.gyp:absl_strings',
         '<(mozc_oss_src_dir)/base/base.gyp:base',
-        '<(mozc_src_dir)/protocol/protocol.gyp:config_proto',
-        '<(mozc_src_dir)/protocol/protocol.gyp:commands_proto',
+        '<(mozc_oss_src_dir)/protocol/protocol.gyp:config_proto',
+        '<(mozc_oss_src_dir)/protocol/protocol.gyp:commands_proto',
       ],
     },
   ],

src/composer/composer.h

@@ -39,14 +39,14 @@
 #include <string>
 #include <vector>
 
-#include "protocol/commands.pb.h"
-#include "protocol/config.pb.h"
 #include "spelling/spellchecker_service_interface.h"
 #include "absl/strings/string_view.h"
 #include "composer/internal/composition.h"
 #include "composer/internal/composition_input.h"
 #include "composer/internal/transliterators.h"
 #include "composer/table.h"
+#include "protocol/commands.pb.h"
+#include "protocol/config.pb.h"
 #include "testing/gunit_prod.h"  // for FRIEND_TEST()
 #include "transliteration/transliteration.h"
 

src/composer/composer_main.cc

@@ -33,12 +33,12 @@
 #include <string>
 #include <utility>
 
-#include "protocol/commands.pb.h"
-#include "protocol/config.pb.h"
 #include "absl/flags/flag.h"
 #include "base/init_mozc.h"
 #include "composer/composer.h"
 #include "composer/table.h"
+#include "protocol/commands.pb.h"
+#include "protocol/config.pb.h"
 #include "transliteration/transliteration.h"
 
 ABSL_FLAG(std::string, table, "system://romanji-hiragana.tsv",

src/composer/composer_test.cc

@@ -39,8 +39,6 @@
 #include <utility>
 #include <vector>
 
-#include "protocol/commands.pb.h"
-#include "protocol/config.pb.h"
 #include "spelling/spellchecker_service_interface.h"
 #include "absl/strings/string_view.h"
 #include "absl/time/time.h"
@@ -52,6 +50,8 @@
 #include "config/config_handler.h"
 #include "converter/segments.h"
 #include "data_manager/testing/mock_data_manager.h"
+#include "protocol/commands.pb.h"
+#include "protocol/config.pb.h"
 #include "testing/gmock.h"
 #include "testing/gunit.h"
 #include "transliteration/transliteration.h"

src/composer/composer_test.gyp

@@ -48,8 +48,8 @@
         '<(mozc_oss_src_dir)/base/base_test.gyp:clock_mock',
         '<(mozc_oss_src_dir)/config/config.gyp:config_handler',
         '<(mozc_oss_src_dir)/data_manager/testing/mock_data_manager.gyp:mock_data_manager',
-        '<(mozc_src_dir)/protocol/protocol.gyp:commands_proto',
-        '<(mozc_src_dir)/protocol/protocol.gyp:config_proto',
+        '<(mozc_oss_src_dir)/protocol/protocol.gyp:commands_proto',
+        '<(mozc_oss_src_dir)/protocol/protocol.gyp:config_proto',
         '<(mozc_oss_src_dir)/session/session_base.gyp:request_test_util',
         '<(mozc_oss_src_dir)/testing/testing.gyp:gtest_main',
         'composer.gyp:composer',

src/composer/internal/composition_input.h

@@ -33,10 +33,10 @@
 #include <string>
 #include <utility>
 
-#include "protocol/commands.pb.h"
 #include "base/protobuf/repeated_field.h"
 #include "base/strings/assign.h"
 #include "composer/table.h"
+#include "protocol/commands.pb.h"
 
 namespace mozc {
 namespace composer {

src/composer/key_event_util.cc

@@ -33,8 +33,8 @@
 #include <cstddef>
 #include <cstdint>
 
-#include "protocol/commands.pb.h"
 #include "base/logging.h"
+#include "protocol/commands.pb.h"
 
 namespace mozc {
 namespace {

src/composer/key_event_util_test.cc

@@ -34,10 +34,10 @@
 #include <iterator>
 #include <string>
 
-#include "protocol/commands.pb.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/string_view.h"
 #include "composer/key_parser.h"
+#include "protocol/commands.pb.h"
 #include "testing/gunit.h"
 
 namespace mozc {

src/composer/key_parser.cc

@@ -35,7 +35,6 @@
 #include <utility>
 #include <vector>
 
-#include "protocol/commands.pb.h"
 #include "absl/container/btree_set.h"
 #include "absl/container/flat_hash_map.h"
 #include "absl/container/flat_hash_set.h"
@@ -45,6 +44,7 @@
 #include "base/logging.h"
 #include "base/util.h"
 #include "base/vlog.h"
+#include "protocol/commands.pb.h"
 
 namespace mozc {
 namespace {

src/composer/key_parser.h

@@ -34,9 +34,9 @@
 
 #include <string>
 
-#include "protocol/commands.pb.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/span.h"
+#include "protocol/commands.pb.h"
 
 namespace mozc {
 

src/composer/key_parser_test.cc

@@ -32,9 +32,9 @@
 #include <cstdint>
 #include <utility>
 
-#include "protocol/commands.pb.h"
 #include "absl/strings/string_view.h"
 #include "composer/key_event_util.h"
+#include "protocol/commands.pb.h"
 #include "testing/gunit.h"
 
 namespace mozc {

src/composer/table.cc

@@ -40,8 +40,6 @@
 #include <utility>
 #include <vector>
 
-#include "protocol/commands.pb.h"
-#include "protocol/config.pb.h"
 #include "absl/strings/match.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_split.h"
@@ -52,6 +50,8 @@
 #include "base/util.h"
 #include "composer/internal/special_key.h"
 #include "data_manager/data_manager_interface.h"
+#include "protocol/commands.pb.h"
+#include "protocol/config.pb.h"
 
 namespace mozc {
 namespace composer {

src/composer/table.h

@@ -40,14 +40,14 @@
 #include <utility>
 #include <vector>
 
-#include "protocol/commands.pb.h"
-#include "protocol/config.pb.h"
 #include "absl/container/flat_hash_map.h"
 #include "absl/container/flat_hash_set.h"
 #include "absl/strings/string_view.h"
 #include "base/container/trie.h"
 #include "composer/internal/special_key.h"
 #include "data_manager/data_manager_interface.h"
+#include "protocol/commands.pb.h"
+#include "protocol/config.pb.h"
 
 namespace mozc {
 namespace composer {