Stop depending on internal Preconditions.java from service-appsearch.

Bug: 181787682
Test: Presubmit
Change-Id: I2698daafca553ee2463e6f7dd1badda272287ba3
This commit is contained in:
Alexander Dorokhine
2021-05-20 13:45:05 -07:00
parent 83fbf50685
commit c9233287e7
2 changed files with 11 additions and 1 deletions

View File

@@ -29,7 +29,6 @@ genrule {
java_library { java_library {
name: "service-appsearch", name: "service-appsearch",
installable: true,
srcs: [ srcs: [
"java/**/*.java", "java/**/*.java",
":statslog-appsearch-java-gen", ":statslog-appsearch-java-gen",
@@ -37,6 +36,8 @@ java_library {
static_libs: [ static_libs: [
"icing-java-proto-lite", "icing-java-proto-lite",
"libicing-java", "libicing-java",
// This list must be kept in sync with jarjar.txt
"modules-utils-preconditions",
], ],
libs: [ libs: [
"framework", "framework",
@@ -44,6 +45,7 @@ java_library {
"framework-statsd.stubs.module_lib", "framework-statsd.stubs.module_lib",
"services.core", "services.core",
"services.usage", "services.usage",
"unsupportedappusage", // TODO(b/181887768) should be removed
], ],
required: [ required: [
"libicing", "libicing",
@@ -56,4 +58,5 @@ java_library {
"//frameworks/base/services/tests/servicestests", "//frameworks/base/services/tests/servicestests",
], ],
apex_available: ["com.android.appsearch"], apex_available: ["com.android.appsearch"],
installable: true,
} }

View File

@@ -1,2 +1,9 @@
rule com.google.protobuf.** com.android.server.appsearch.protobuf.@1 rule com.google.protobuf.** com.android.server.appsearch.protobuf.@1
rule com.google.android.icing.proto.** com.android.server.appsearch.proto.@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