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

Commit e702085f authored by Alexander Dorokhine's avatar Alexander Dorokhine Committed by Android (Google) Code Review
Browse files

Merge "Remove protos from sdk."

parents a3eea61e d8d79497

apex/appsearch/framework/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -26,10 +26,8 @@ java_sdk_library { 
    srcs: [ ":framework-appsearch-sources" ],

    sdk_version: "core_platform", // TODO(b/146218515) should be module_current

    impl_only_libs: ["framework-minus-apex"], // TODO(b/146218515) should be removed

    static_libs: ["icing-java-proto-lite"],

    defaults: ["framework-module-defaults"],

    permitted_packages: ["android.app.appsearch"],

    jarjar_rules: "jarjar-rules.txt",

    aidl: {

        include_dirs: ["frameworks/base/core/java"], // TODO(b/146218515) should be removed

    },

apex/appsearch/framework/jarjar-rules.txt

deleted100644 → 0
+0 −2
Original line number Diff line number Diff line 
rule com.google.protobuf.** android.app.appsearch.protobuf.@1

rule com.google.android.icing.proto.** android.app.appsearch.proto.@1

core/tests/coretests/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ android_test { 
        "android.test.mock",

        "framework-atb-backward-compatibility",

        "framework",

        "icing-java-proto-lite",

        "ext",

        "framework-res",

    ],