summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-prod (mdb) <android-build-team-robot@google.com>2017-11-01 22:05:12 +0000
committerandroid-build-prod (mdb) <android-build-team-robot@google.com>2017-11-01 22:05:12 +0000
commitb02a738cb3f057d3b561fea4064c97e2f38fd7b2 (patch)
tree33a3377a4caf520682687734541ee48206631db4
parent9726a938070e2f281219ef3187f54ef758e6a075 (diff)
parentc731915e80d9e2ccb755b97e7fdd280bbea07f70 (diff)
downloadgoogle-tv-pairing-protocol-sdk-release.tar.gz
Snap for 4429331 from c731915e80d9e2ccb755b97e7fdd280bbea07f70 to sdk-releasesdk-release
Change-Id: Ie4b4b95bc3fe913d0c0ed1bcb8ce61189dcb4bc8
-rw-r--r--java/src/com/google/polo/wire/protobuf/ProtobufWireAdapter.java3
-rw-r--r--proto/polo.proto4
2 files changed, 5 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..3d8ef75 100644
--- a/proto/polo.proto
+++ b/proto/polo.proto
@@ -2,7 +2,9 @@
package polo.wire.protobuf;
-option javanano_use_deprecated_package = true;
+//removing deprecated option.
+//refer go/namespacing-nano for additional details.
+//option javanano_use_deprecated_package = true;
option java_outer_classname = "PoloProto";
option java_package = "com.google.polo.wire.protobuf";
option optimize_for = LITE_RUNTIME;