From d662ec9c2e4f8ca21cb500b25cfe7430511014b2 Mon Sep 17 00:00:00 2001 From: Adam Cozzette Date: Fri, 16 Jul 2021 12:26:09 -0700 Subject: [PATCH] Update the automake and Bazel configs to be consistent about field_access_listener.cc (#8823) In an earlier change I moved field_access_listener.cc from the lite runtime to the full runtime in the CMake configuration, but this caused //:build_files_updated_unittest to start failing because it expects all three build systems to be consistent. To fix that, I updated the Automake configuration and then ran ./update_file_lists.sh to propagate that change to the other configs. --- BUILD | 2 +- src/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/BUILD b/BUILD index 37030da86155..441f28b3e18d 100644 --- a/BUILD +++ b/BUILD @@ -135,7 +135,6 @@ cc_library( "src/google/protobuf/arena.cc", "src/google/protobuf/arenastring.cc", "src/google/protobuf/extension_set.cc", - "src/google/protobuf/field_access_listener.cc", "src/google/protobuf/generated_enum_util.cc", "src/google/protobuf/generated_message_table_driven_lite.cc", "src/google/protobuf/generated_message_util.cc", @@ -193,6 +192,7 @@ cc_library( "src/google/protobuf/dynamic_message.cc", "src/google/protobuf/empty.pb.cc", "src/google/protobuf/extension_set_heavy.cc", + "src/google/protobuf/field_access_listener.cc", "src/google/protobuf/field_mask.pb.cc", "src/google/protobuf/generated_message_reflection.cc", "src/google/protobuf/generated_message_table_driven.cc", diff --git a/src/Makefile.am b/src/Makefile.am index ed1b66207939..edd366058500 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -207,7 +207,6 @@ libprotobuf_lite_la_SOURCES = \ google/protobuf/arena.cc \ google/protobuf/arenastring.cc \ google/protobuf/extension_set.cc \ - google/protobuf/field_access_listener.cc \ google/protobuf/generated_enum_util.cc \ google/protobuf/generated_message_util.cc \ google/protobuf/generated_message_table_driven_lite.h \ @@ -242,6 +241,7 @@ libprotobuf_la_SOURCES = \ google/protobuf/dynamic_message.cc \ google/protobuf/empty.pb.cc \ google/protobuf/extension_set_heavy.cc \ + google/protobuf/field_access_listener.cc \ google/protobuf/field_mask.pb.cc \ google/protobuf/generated_message_reflection.cc \ google/protobuf/generated_message_table_driven_lite.h \