From c9233287e7f7b21215e9aeb9fa939221b1f304d5 Mon Sep 17 00:00:00 2001
From: Alexander Dorokhine <adorokhine@google.com>
Date: Thu, 20 May 2021 13:45:05 -0700
Subject: [PATCH] Stop depending on internal Preconditions.java from
 service-appsearch.

Bug: 181787682
Test: Presubmit
Change-Id: I2698daafca553ee2463e6f7dd1badda272287ba3
---
 apex/appsearch/service/Android.bp       | 5 ++++-
 apex/appsearch/service/jarjar-rules.txt | 7 +++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/apex/appsearch/service/Android.bp b/apex/appsearch/service/Android.bp
index ad798c747d9cf..8d606c5e61cd2 100644
--- a/apex/appsearch/service/Android.bp
+++ b/apex/appsearch/service/Android.bp
@@ -29,7 +29,6 @@ genrule {
 
 java_library {
     name: "service-appsearch",
-    installable: true,
     srcs: [
         "java/**/*.java",
         ":statslog-appsearch-java-gen",
@@ -37,6 +36,8 @@ java_library {
     static_libs: [
         "icing-java-proto-lite",
         "libicing-java",
+        // This list must be kept in sync with jarjar.txt
+        "modules-utils-preconditions",
     ],
     libs: [
         "framework",
@@ -44,6 +45,7 @@ java_library {
         "framework-statsd.stubs.module_lib",
         "services.core",
         "services.usage",
+        "unsupportedappusage", // TODO(b/181887768) should be removed
     ],
     required: [
         "libicing",
@@ -56,4 +58,5 @@ java_library {
         "//frameworks/base/services/tests/servicestests",
     ],
     apex_available: ["com.android.appsearch"],
+    installable: true,
 }
diff --git a/apex/appsearch/service/jarjar-rules.txt b/apex/appsearch/service/jarjar-rules.txt
index c48e8327fae83..569d7c5584714 100644
--- a/apex/appsearch/service/jarjar-rules.txt
+++ b/apex/appsearch/service/jarjar-rules.txt
@@ -1,2 +1,9 @@
 rule com.google.protobuf.** com.android.server.appsearch.protobuf.@1
 rule com.google.android.icing.proto.** com.android.server.appsearch.proto.@1
+
+# Rename all com.android.internal.util classes to prevent class name collisions
+# between this module and the other versions of the utility classes linked into
+# the framework.
+
+# These must be kept in sync with the sources of framework-utils-appsearch
+rule com.android.internal.util.Preconditions* com.android.server.appsearch.internal.util.Preconditions@1