commit 1345b759f5b29692855fa17e6fd95dfcda3ce022
author TreeHugger Robot <treehugger-gerrit@google.com> Wed May 18 04:03:41 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 18 04:03:41 2022 +0000
tree eb1504486001e9be667fba24e77d15c63018b71f
parent 327eb4d6ca3c1fa316303be4bd8c552273be0ab8
parent 019d86bcd4081be73c4f655f0e6cbc05cc69763e

Merge "Explicitly enabled Proguard compat for NearbyMultiDevicesClientsSnippets" into tm-dev

nearby/tests/multidevices/clients/Android.bp

diff --git a/nearby/tests/multidevices/clients/Android.bp b/nearby/tests/multidevices/clients/Android.bp
index b1bf9a7..db6d191 100644
--- a/nearby/tests/multidevices/clients/Android.bp
+++ b/nearby/tests/multidevices/clients/Android.bp
@@ -41,6 +41,9 @@
     optimize: {
         enabled: true,
         shrink: false,
+        // Required to avoid class collisions from static and shared linking
+        // of MessageNano.
+        proguard_compatibility: true,
         proguard_flags_files: ["proguard.flags"],
     },
 }