Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(24)

Unified Diff: third_party/protobuf/.gitignore

Issue 2590803003: Revert "third_party/protobuf: Update to HEAD (83d681ee2c)" (Closed)
Patch Set: Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/policy/BUILD.gn ('k') | third_party/protobuf/.gitmodules » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/protobuf/.gitignore
diff --git a/third_party/protobuf/.gitignore b/third_party/protobuf/.gitignore
index 4383c623e5d3cfb96eb5ba5cce726327213ec4e0..27eeb9c224afdd9bf8f2e39a9b3fefffa9c1418f 100644
--- a/third_party/protobuf/.gitignore
+++ b/third_party/protobuf/.gitignore
@@ -64,8 +64,6 @@ src/protoc
src/unittest_proto_middleman
# Generated test scaffolding
-src/no_warning_test.cc
-src/no-warning-test
src/protobuf*-test
src/test_plugin
src/testzip.*
@@ -79,8 +77,7 @@ src/**/*.log
src/**/*.trs
# JavaBuild output.
-java/core/target
-java/util/target
+java/target
javanano/target
# Windows native output.
@@ -91,14 +88,16 @@ build_msvc
# packages themselves.
/csharp/src/packages/*/
+# Directories created by opening the Objective C Xcode projects.
+objectivec/ProtocolBuffers_OSX.xcodeproj/project.xcworkspace/xcuserdata/
+objectivec/ProtocolBuffers_OSX.xcodeproj/project.xcworkspace/xcshareddata/ProtocolBuffers_OSX.xccheckout
+objectivec/ProtocolBuffers_OSX.xcodeproj/xcuserdata/
+objectivec/ProtocolBuffers_iOS.xcodeproj/project.xcworkspace/xcuserdata/
+objectivec/ProtocolBuffers_iOS.xcodeproj/project.xcworkspace/xcshareddata/ProtocolBuffers_iOS.xccheckout
+objectivec/ProtocolBuffers_iOS.xcodeproj/xcuserdata/
# OS X's Finder creates these for state about opened windows/etc.
**/.DS_Store
-# Cocoapods artifacts
-# Podfile.lock and the workspace file are tracked, to ease deleting them. That's
-# needed to trigger "pod install" to rerun the preinstall commands.
-Pods/
-
# Comformance test output
conformance/.libs/
conformance/com/
@@ -111,35 +110,8 @@ conformance/conformance.pb.cc
conformance/conformance.pb.h
conformance/Conformance.pbobjc.h
conformance/Conformance.pbobjc.m
-conformance/conformance_pb.rb
-conformance/failing_tests.txt
+conformance/conformance.rb
conformance/google/
conformance/javac_middleman
conformance/lite/
-conformance/nonexistent_tests.txt
conformance/protoc_middleman
-conformance/succeeding_tests.txt
-
-# php test output
-composer.lock
-php/tests/generated/
-php/ext/google/protobuf/.libs/
-php/ext/google/protobuf/Makefile.fragments
-php/ext/google/protobuf/Makefile.global
-php/ext/google/protobuf/Makefile.objects
-php/ext/google/protobuf/acinclude.m4
-php/ext/google/protobuf/build/
-php/ext/google/protobuf/config.h
-php/ext/google/protobuf/config.nice
-php/ext/google/protobuf/configure.in
-php/ext/google/protobuf/mkinstalldirs
-php/ext/google/protobuf/run-tests.php
-vendor/
-
-# JavaScript artifacts
-js/commonjs_out/
-js/deps.js
-js/google-protobuf.js
-js/google/
-js/node_modules/
-js/testproto_libs.js
« no previous file with comments | « components/policy/BUILD.gn ('k') | third_party/protobuf/.gitmodules » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698