Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 952ef52a authored by Alexander Dorokhine's avatar Alexander Dorokhine Committed by Automerger Merge Worker
Browse files

Stop depending on internal Preconditions.java from service-appsearch. am: c9233287 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14637434

Change-Id: Iba38fa0d3993b6211e33907e50c641959adfce44
parents 6b1b66aa c9233287

apex/appsearch/service/Android.bp

+4 −1
Original line number Diff line number Diff line
@@ -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,

}

apex/appsearch/service/jarjar-rules.txt

+7 −0
Original line number Diff line number Diff line 
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