From 7bcf8af9df8c24687f27fc262764628c4d80ff51 Mon Sep 17 00:00:00 2001 From: Tamas Berghammer Date: Tue, 12 Jul 2016 15:51:41 +0100 Subject: Update package names to work with the proto3 compiler Bug: b/28974522 Change-Id: Ib442b050bafb4769cf9ce6998e7a4f9708ba3625 (cherry picked from commit 7a5b2c7bd1f6c7847fa2dad591788177a59d6f74) --- java/src/com/google/polo/wire/protobuf/ProtobufWireAdapter.java | 3 ++- 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; -- cgit v1.2.3