commit 84cad11e5d8c3000472e8bb22dc698cf9b3c8612
author Tamas Berghammer <tberghammer@google.com> Wed Jan 18 20:22:01 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 18 20:22:01 2017 +0000
tree 8dd55317d69711c7aad2632948ca041d76007d13
parent 7756aa6aaf75b5562a298b461669e2ee5783a418
parent e69f086d72c69e842c6252b29427c5b15a0853b2

DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"
am: e69f086d72

Change-Id: Ia7693c0bf6c730766100bb670a61d9bfda3c1345

java/src/com/google/polo/wire/protobuf/ProtobufWireAdapter.java

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.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;

proto/polo.proto

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;