Add service-nearby jarjar rules
This is a partial cherry-pick of change:
Ibf8d3ee5274a709479b9ab7f0af2b3e0a7e7fa7b
Which puts jarjar-rules.txt in line with what is in downstream branches.
There is no class matching the referenced classes in branches receiving
this cherry-pick, so this should be a no-op.
Test: build and check classes in service-connectivity.jar.
Bug: 217115866
Merged-In: Ibf8d3ee5274a709479b9ab7f0af2b3e0a7e7fa7b
Change-Id: I405b452092b048e0c2030ddfc3dfd8f78709697e
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)