summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authornyquist <nyquist@chromium.org>2014-09-02 17:08:20 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-03 00:26:04 +0000
commite3f2241bc1235a54254f165db374f6013e037233 (patch)
treef48c98b6b79e6b6d8bc6476158b6483a33ef6657 /.gitignore
parent278d42a659161b96461b27e166d44224da697eaa (diff)
downloadchromium_src-e3f2241bc1235a54254f165db374f6013e037233.zip
chromium_src-e3f2241bc1235a54254f165db374f6013e037233.tar.gz
chromium_src-e3f2241bc1235a54254f165db374f6013e037233.tar.bz2
Revert of Add support for Java nano protocol buffers for Android. (patchset #4 id:60001 of https://codereview.chromium.org/511283003/)
Reason for revert: Breaks some workflows and also should get new quota. Original issue's description: > Add support for Java nano protocol buffers for Android. > > This CL adds a new dependency on the protocol buffer compiler > from the android source tree, since this compiler supports > generating Java files using the nano runtime. > > The initial version of this dependency is 2.2.0a, but checked > out as what the Android 4.4.4 Release 2.0.1 tag points to. > > This CL adds a new protoc binary (for compiling protos) that supports > this, and also adds a Java library with the runtime. > > To simplify use of this, it also updates build/protoc_java.gypi to > support generating nano protos by specifying an optional > proto_runtime argument. The argument defaults to 'lite' which does > the same thing as before this change, and setting it to 'nano' > generates the new style Java files. > > The plan is to quickly deprecate the 'lite' runtime for Java, since > it is too big and uses too many methods. > > BUG=377891 > > Committed: https://chromium.googlesource.com/chromium/src/+/d8ae0a79834531e41912de44b9e212ffa7eb2785 TBR=cjhopman@chromium.org,darin@chromium.org NOTREECHECKS=true NOTRY=true BUG=377891 Review URL: https://codereview.chromium.org/534703004 Cr-Commit-Position: refs/heads/master@{#293028}
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 2144ec1..9d49fe6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -215,7 +215,6 @@ v8.log
/third_party/adobe/flash/binaries
/third_party/adobe/flash/symbols
/third_party/amd/
-/third_party/android_protobuf/src
/third_party/android_tools/
/third_party/android_tools_internal/
/third_party/angle