Update deps.

yukawa · Jan 30, 2024 · a98fca1 · a98fca1
1 parent 70d1d52
commit a98fca1
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 12 deletions.
diff --git a/src/base/absl.gyp b/src/base/absl.gyp
@@ -176,6 +176,7 @@
       'toolsets': ['host', 'target'],
       'sources': [
         '<!@(<(glob_absl) status "*.cc")',
+        '<!@(<(glob_absl) status/internal "*.cc")',
       ],
       'dependencies': [
         'absl_base',

diff --git a/src/protobuf/protobuf.gyp b/src/protobuf/protobuf.gyp
@@ -71,13 +71,14 @@
       '<!@(<(glob_protobuf) . "*.cc" --exclude "*.pb.cc" reflection_tester.cc)',
       '<!@(<(glob_protobuf) io "*.cc")',
       '<!@(<(glob_protobuf) stubs "*.cc")',
-      '<!@(<(glob) --notest --base <(protobuf_root)/third_party/utf8_range "*.cc")',
+      '<!@(<(glob) --notest --base <(protobuf_root)/third_party/utf8_range "*.cc" "*.c" --exclude main.c)',
     ],
     # Sources for protoc (common part and C++ generator only).
     'protoc_sources': [
-      '<!@(<(glob_protobuf) compiler "*.cc" --exclude "*_tester.cc" fake_plugin.cc test_plugin.cc main.cc)',
+      '<!@(<(glob_protobuf) compiler "*.cc" --exclude "*_tester.cc" fake_plugin.cc test_plugin.cc main.cc main_no_generators.cc)',
       '<!@(<(glob_protobuf) compiler/allowlists "*.cc")',
-      '<!@(<(glob_protobuf) compiler/cpp "**/*.cc" --exclude main.cc)',
+      '<!@(<(glob_protobuf) compiler/cpp "*.cc" --exclude main.cc)',
+      '<!@(<(glob_protobuf) compiler/cpp/field_generators "*.cc")',
       'custom_protoc_main.cc',
     ],
   },
@@ -122,13 +123,6 @@
           'msvs_disabled_warnings': [
             '<@(msvc_disabled_warnings_for_protoc)',
           ],
-          'msvs_settings': {
-            'VCCLCompilerTool': {
-              'AdditionalOptions': [
-                '/permissive',  # https://github.com/protocolbuffers/protobuf/issues/14602
-              ],
-            },
-          },
           'xcode_settings': {
             'USE_HEADERMAP': 'NO',
           },

diff --git a/src/rewriter/calculator/calculator_test.cc b/src/rewriter/calculator/calculator_test.cc
@@ -33,6 +33,7 @@
 #include <ostream>
 #include <string>
 
+#include "absl/strings/numbers.h"
 #include "absl/strings/string_view.h"
 #include "base/file_util.h"
 #include "base/logging.h"

diff --git a/src/third_party/abseil-cpp b/src/third_party/abseil-cpp
diff --git a/src/third_party/protobuf b/src/third_party/protobuf