Stop depending on internal Preconditions.java from service-appsearch.
Bug: 181787682 Test: Presubmit Change-Id: I2698daafca553ee2463e6f7dd1badda272287ba3
This commit is contained in:
@@ -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,
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user