From a851b3307b0e213c230d6743284d256d685c14ab Mon Sep 17 00:00:00 2001 From: Remi NGUYEN VAN Date: Tue, 7 Jun 2022 11:49:16 +0900 Subject: [PATCH] Add jarjar rule for android.support.v4 Nearby indirectly uses android.support.v4.os.ResultReceiver, which needs to be jarjared to ensure it does not conflict with other jars that may include it. Bug: 217115866 Test: m, inspect class names before and after Change-Id: I8b38b7af63999d6d336179bb690a0805f7a41c3a --- service/jarjar-rules.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/service/jarjar-rules.txt b/service/jarjar-rules.txt index c7223fcf37..4013d2eca7 100644 --- a/service/jarjar-rules.txt +++ b/service/jarjar-rules.txt @@ -118,6 +118,7 @@ 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 +rule android.support.v4.** 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)