aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Onorato <joeo@google.com>2019-03-26 16:14:33 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-03-26 16:14:33 -0700
commitfc4f1c09aaa9f7635c4eb925b28eef33e1c8b328 (patch)
treee33d85364457b339459cdeb84d018d14841d12a6
parent55f71ffad69c55f76a71a4cee5bcf42f98611aa5 (diff)
parent03e4228d92837b8e0ad5688fcf9feada7d4712f5 (diff)
downloadprotobuf-fc4f1c09aaa9f7635c4eb925b28eef33e1c8b328.tar.gz
Merge "Add the zero copy input stream implementations to proto lite." am: 7a5fd27c55
am: 03e4228d92 Change-Id: I0a6bf8ffbc8a51c89797c75076151c5624a262d8
-rw-r--r--Android.bp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index 0fdeb4243..dafb77806 100644
--- a/Android.bp
+++ b/Android.bp
@@ -75,6 +75,7 @@ cc_defaults {
"src/google/protobuf/wire_format_lite.cc",
"src/google/protobuf/io/coded_stream.cc",
"src/google/protobuf/io/zero_copy_stream.cc",
+ "src/google/protobuf/io/zero_copy_stream_impl.cc",
"src/google/protobuf/io/zero_copy_stream_impl_lite.cc",
],
@@ -179,7 +180,6 @@ cc_defaults {
"src/google/protobuf/io/printer.cc",
"src/google/protobuf/io/strtod.cc",
"src/google/protobuf/io/tokenizer.cc",
- "src/google/protobuf/io/zero_copy_stream_impl.cc",
"src/google/protobuf/compiler/importer.cc",
"src/google/protobuf/compiler/parser.cc",
"src/google/protobuf/util/field_comparator.cc",