commit 64a347b6a4acc251868cad1664610a32cd512b28
author Treehugger Robot <treehugger-gerrit@google.com> Thu May 12 10:18:19 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu May 12 10:18:19 2022 +0000
tree a98094aec242439a51417732247f461360b2d6c1
parent c1edc4cadd0204d122d66f67ed41cac055522f0a
parent 8b4a27d86927966e2cabb9606207d6987594480d

Merge "Add service-nearby jarjar rules"

service/jarjar-rules.txt

diff --git a/service/jarjar-rules.txt b/service/jarjar-rules.txt
index c1c2e9d..c7223fc 100644
--- a/service/jarjar-rules.txt
+++ b/service/jarjar-rules.txt
@@ -105,14 +105,19 @@
 # From the API shims
 rule com.android.networkstack.apishim.** com.android.connectivity.@0
 
-# From fast-pair-lite-protos
-rule service.proto.** com.android.server.nearby.@0
-
 # From filegroup framework-connectivity-protos
 rule android.service.*Proto com.android.connectivity.@0
 
 # From mdns-aidl-interface
 rule android.net.mdns.aidl.** android.net.connectivity.@0
 
+# From nearby-service, including proto
+rule service.proto.** com.android.server.nearby.@0
+rule androidx.annotation.Keep* com.android.server.nearby.@0
+rule androidx.collection.** com.android.server.nearby.@0
+rule androidx.core.** com.android.server.nearby.@0
+rule androidx.versionedparcelable.** com.android.server.nearby.@0
+rule com.google.common.** com.android.server.nearby.@0
+
 # Remaining are connectivity sources in com.android.server and com.android.server.connectivity:
 # TODO: move to a subpackage of com.android.connectivity (such as com.android.connectivity.server)