Chromium Code Reviews| Index: third_party/protobuf/patches/0012-fixes-for-js-embed-cc.patch |
| diff --git a/third_party/protobuf/patches/0012-fixes-for-js-embed-cc.patch b/third_party/protobuf/patches/0012-fixes-for-js-embed-cc.patch |
| new file mode 100644 |
| index 0000000000000000000000000000000000000000..74d00b53bc912ca3047eac2137da1e0419da71ab |
| --- /dev/null |
| +++ b/third_party/protobuf/patches/0012-fixes-for-js-embed-cc.patch |
| @@ -0,0 +1,25 @@ |
| +diff --git a/.gitignore b/.gitignore |
| +index 4f42646..8b42cac 100644 |
| +--- a/.gitignore |
| ++++ b/.gitignore |
| +@@ -47,7 +47,6 @@ any_test.pb.* |
| + map*unittest.pb.* |
| + unittest*.pb.* |
| + cpp_test*.pb.* |
| +-src/google/protobuf/compiler/js/well_known_types_embed.cc |
| + src/google/protobuf/util/**/*.pb.cc |
| + src/google/protobuf/util/**/*.pb.h |
| + |
| +diff --git a/src/google/protobuf/compiler/js/embed.cc b/src/google/protobuf/compiler/js/embed.cc |
| +index d04fea2..cfa84a9 100644 |
| +--- a/src/google/protobuf/compiler/js/embed.cc |
| ++++ b/src/google/protobuf/compiler/js/embed.cc |
| +@@ -98,7 +98,7 @@ static void AddFile(const char* name, std::basic_ostream<char>* out) { |
| + |
| + int main(int argc, char *argv[]) { |
| + std::cout << "#include " |
| +- "\"google/protobuf/compiler/js/well_known_types_embed.h\"\n"; |
| ++ "<google/protobuf/compiler/js/well_known_types_embed.h>\n"; |
|
Peter Kasting
2016/12/23 10:51:42
Do we only need to make this change because we gen
jbriance
2016/12/23 12:15:35
This is to fix the following presubmit error:
*
|
| + std::cout << "struct FileToc well_known_types_js[] = {\n"; |
| + |
| + for (int i = 1; i < argc; i++) { |