diff options
| author | Tamas Berghammer <tberghammer@google.com> | 2017-01-18 17:42:05 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-01-18 17:42:05 +0000 |
| commit | 7756aa6aaf75b5562a298b461669e2ee5783a418 (patch) | |
| tree | 182cf7ac4ab09c3cd48b6d22878b7d32e89c3ce7 | |
| parent | 9726a938070e2f281219ef3187f54ef758e6a075 (diff) | |
| parent | 7bcf8af9df8c24687f27fc262764628c4d80ff51 (diff) | |
| download | google-tv-pairing-protocol-7756aa6aaf75b5562a298b461669e2ee5783a418.tar.gz | |
Update package names to work with the proto3 compiler
am: 7bcf8af9df
Change-Id: I06b3c6f3fb507ff927398b9ceda6ee5e88ca4193
| -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 ea3a7cb..50c8035 100644 --- a/java/src/com/google/polo/wire/protobuf/ProtobufWireAdapter.java +++ b/java/src/com/google/polo/wire/protobuf/ProtobufWireAdapter.java @@ -32,7 +32,8 @@ 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.PoloProto.OuterMessage; +import com.google.polo.wire.protobuf.nano.PoloProto; +import com.google.polo.wire.protobuf.nano.PoloProto.OuterMessage; import com.google.protobuf.nano.MessageNano; import java.io.IOException; diff --git a/proto/polo.proto b/proto/polo.proto index 0491439..fbe95e9 100644 --- a/proto/polo.proto +++ b/proto/polo.proto @@ -2,7 +2,6 @@ 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; |