commit 438d777e0554f5ca2c10e98cdabf74971076046a
author Deanna Garcia <deannagarcia@google.com> Wed Mar 24 20:00:57 2021 +0000
committer Deanna Garcia <deannagarcia@google.com> Wed Mar 24 20:00:57 2021 +0000
tree dc293942e03c9c241b12ab57bd581c4e29d85d0a
parent 2c9aca53820ad49c389efb0946f2d25338de1316

Adding file names to cmake files

BUILD

diff --git a/BUILD b/BUILD
index 07ee629..46d284e 100644
--- a/BUILD
+++ b/BUILD
@@ -401,6 +401,7 @@
         "src/google/protobuf/compiler/java/java_generator.cc",
         "src/google/protobuf/compiler/java/java_generator_factory.cc",
         "src/google/protobuf/compiler/java/java_helpers.cc",
+        "src/google/protobuf/compiler/java/java_kotlin_generator.cc",
         "src/google/protobuf/compiler/java/java_map_field.cc",
         "src/google/protobuf/compiler/java/java_map_field_lite.cc",
         "src/google/protobuf/compiler/java/java_message.cc",

cmake/extract_includes.bat.in

diff --git a/cmake/extract_includes.bat.in b/cmake/extract_includes.bat.in
index 5c5799e..ad630af 100644
--- a/cmake/extract_includes.bat.in
+++ b/cmake/extract_includes.bat.in
@@ -26,6 +26,7 @@
 copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\compiler\csharp\csharp_names.h" include\google\protobuf\compiler\csharp\csharp_names.h
 copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\compiler\importer.h" include\google\protobuf\compiler\importer.h
 copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\compiler\java\java_generator.h" include\google\protobuf\compiler\java\java_generator.h
+copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\compiler\java\java_kotlin_generator.h" include\google\protobuf\compiler\java\java_kotlin_generator.h
 copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\compiler\java\java_names.h" include\google\protobuf\compiler\java\java_names.h
 copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\compiler\js\js_generator.h" include\google\protobuf\compiler\js\js_generator.h
 copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\compiler\js\well_known_types_embed.h" include\google\protobuf\compiler\js\well_known_types_embed.h

cmake/libprotoc.cmake

diff --git a/cmake/libprotoc.cmake b/cmake/libprotoc.cmake
index ecb5a85..6316d83 100644
--- a/cmake/libprotoc.cmake
+++ b/cmake/libprotoc.cmake
@@ -44,6 +44,7 @@
   ${protobuf_source_dir}/src/google/protobuf/compiler/java/java_generator.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/java/java_generator_factory.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/java/java_helpers.cc
+  ${protobuf_source_dir}/src/google/protobuf/compiler/java/java_kotlin_generator.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/java/java_map_field.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/java/java_map_field_lite.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/java/java_message.cc

java/core/BUILD

diff --git a/java/core/BUILD b/java/core/BUILD
index 32565c6..e7778f9 100644
--- a/java/core/BUILD
+++ b/java/core/BUILD
@@ -89,14 +89,6 @@
     "src/main/java/com/google/protobuf/Utf8.java",
     "src/main/java/com/google/protobuf/WireFormat.java",
     "src/main/java/com/google/protobuf/Writer.java",
-    "src/main/kotlin/com/google/protobuf/DslList.kt",
-    "src/main/kotlin/com/google/protobuf/DslMap.kt",
-    "src/main/kotlin/com/google/protobuf/DslProxy.kt",
-    "src/main/kotlin/com/google/protobuf/ExtendableMessageLiteExtensions.kt",
-    "src/main/kotlin/com/google/protobuf/ExtensionList.kt",
-    "src/main/kotlin/com/google/protobuf/OnlyForUseByGeneratedProtoCode.kt",
-    "src/main/kotlin/com/google/protobuf/ProtoDslMarker.kt",
-    "src/main/kotlin/com/google/protobuf/UnmodifiableCollections.kt",
 ]
 
 # Should be used as `//java/lite`.

src/google/protobuf/compiler/java/java_kotlin_generator.h

diff --git a/src/google/protobuf/compiler/java/java_kotlin_generator.h b/src/google/protobuf/compiler/java/java_kotlin_generator.h
index 98589c3..db15353 100644
--- a/src/google/protobuf/compiler/java/java_kotlin_generator.h
+++ b/src/google/protobuf/compiler/java/java_kotlin_generator.h
@@ -1,5 +1,5 @@
-#ifndef GOOGLE_PROTOBUF_COMPILER_JAVA_JAVA_KOTLIN_GENERATOR_H_
-#define GOOGLE_PROTOBUF_COMPILER_JAVA_JAVA_KOTLIN_GENERATOR_H_
+#ifndef GOOGLE_PROTOBUF_COMPILER_JAVA_KOTLIN_GENERATOR_H_
+#define GOOGLE_PROTOBUF_COMPILER_JAVA_KOTLIN_GENERATOR_H_
 
 #include <string>
 #include <google/protobuf/compiler/code_generator.h>
@@ -37,4 +37,4 @@
 
 #include <google/protobuf/port_undef.inc>
 
-#endif  // GOOGLE_PROTOBUF_COMPILER_JAVA_JAVA_KOTLIN_GENERATOR_H_
+#endif  // GOOGLE_PROTOBUF_COMPILER_JAVA_KOTLIN_GENERATOR_H_