diff options
| author | Tamas Berghammer <tberghammer@google.com> | 2017-01-18 20:22:01 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-01-18 20:22:01 +0000 |
| commit | 84cad11e5d8c3000472e8bb22dc698cf9b3c8612 (patch) | |
| tree | 8dd55317d69711c7aad2632948ca041d76007d13 | |
| parent | 7756aa6aaf75b5562a298b461669e2ee5783a418 (diff) | |
| parent | e69f086d72c69e842c6252b29427c5b15a0853b2 (diff) | |
| download | google-tv-pairing-protocol-84cad11e5d8c3000472e8bb22dc698cf9b3c8612.tar.gz | |
DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"android-wear-o-preview-4android-wear-o-preview-3android-o-preview-4android-o-preview-3android-o-preview-2android-o-iot-preview-5android-n-iot-preview-4o-iot-preview-5n-iot-preview-4
am: e69f086d72
Change-Id: Ia7693c0bf6c730766100bb670a61d9bfda3c1345
| -rw-r--r-- | java/src/com/google/polo/wire/protobuf/ProtobufWireAdapter.java | 3 | ||||
| -rw-r--r-- | proto/polo.proto | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/java/src/com/google/polo/wire/protobuf/ProtobufWireAdapter.java b/java/src/com/google/polo/wire/protobuf/ProtobufWireAdapter.java index 50c8035..ea3a7cb 100644 --- a/java/src/com/google/polo/wire/protobuf/ProtobufWireAdapter.java +++ b/java/src/com/google/polo/wire/protobuf/ProtobufWireAdapter.java @@ -32,8 +32,7 @@ import com.google.polo.pairing.message.PoloMessage; import com.google.polo.pairing.message.SecretAckMessage; import com.google.polo.pairing.message.SecretMessage; import com.google.polo.wire.PoloWireInterface; -import com.google.polo.wire.protobuf.nano.PoloProto; -import com.google.polo.wire.protobuf.nano.PoloProto.OuterMessage; +import com.google.polo.wire.protobuf.PoloProto.OuterMessage; import com.google.protobuf.nano.MessageNano; import java.io.IOException; diff --git a/proto/polo.proto b/proto/polo.proto index fbe95e9..0491439 100644 --- a/proto/polo.proto +++ b/proto/polo.proto @@ -2,6 +2,7 @@ package polo.wire.protobuf; +option javanano_use_deprecated_package = true; option java_outer_classname = "PoloProto"; option java_package = "com.google.polo.wire.protobuf"; option optimize_for = LITE_RUNTIME; |