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

Commit 27b40fc2 authored by Anton Hansson's avatar Anton Hansson Committed by Gerrit Code Review
Browse files

Merge "Revert "Add genrules for merged removed.txt files""

parents 3a463815 ca5b8b5c

api/Android.bp

+0 −52
Original line number Diff line number Diff line
@@ -62,24 +62,6 @@ genrule { 
    cmd: "$(location metalava) --no-banner --format=v2 $(in) --api $(out)",

}



genrule {

    name: "frameworks-base-api-removed-merged.txt",

    srcs: [

        ":conscrypt.module.public.api{.public.removed-api.txt}",

        ":framework-media{.public.removed-api.txt}",

        ":framework-mediaprovider{.public.removed-api.txt}",

        ":framework-permission{.public.removed-api.txt}",

        ":framework-sdkextensions{.public.removed-api.txt}",

        ":framework-statsd{.public.removed-api.txt}",

        ":framework-tethering{.public.removed-api.txt}",

        ":framework-wifi{.public.removed-api.txt}",

        ":non-updatable-removed.txt",

    ],

    out: ["removed.txt"],

    tools: ["metalava"],

    cmd: "$(location metalava) --no-banner --format=v2 $(in) --api $(out)",

}



genrule {

    name: "frameworks-base-api-system-current-merged.txt",

    srcs: [
@@ -97,23 +79,6 @@ genrule { 
    cmd: "$(location metalava) --no-banner --format=v2 $(in) --api $(out)",

}



genrule {

    name: "frameworks-base-api-system-removed-merged.txt",

    srcs: [

        ":framework-media{.system.removed-api.txt}",

        ":framework-mediaprovider{.system.removed-api.txt}",

        ":framework-permission{.system.removed-api.txt}",

        ":framework-sdkextensions{.system.removed-api.txt}",

        ":framework-statsd{.system.removed-api.txt}",

        ":framework-tethering{.system.removed-api.txt}",

        ":framework-wifi{.system.removed-api.txt}",

        ":non-updatable-system-removed.txt",

    ],

    out: ["system-removed.txt"],

    tools: ["metalava"],

    cmd: "$(location metalava) --no-banner --format=v2 $(in) --api $(out)",

}



genrule {

    name: "frameworks-base-api-module-lib-current-merged.txt",

    srcs: [
@@ -130,20 +95,3 @@ genrule { 
    tools: ["metalava"],

    cmd: "$(location metalava) --no-banner --format=v2 $(in) --api $(out)",

}
 


genrule {

    name: "frameworks-base-api-module-lib-removed-merged.txt",

    srcs: [

        ":framework-media{.module-lib.removed-api.txt}",

        ":framework-mediaprovider{.module-lib.removed-api.txt}",

        ":framework-permission{.module-lib.removed-api.txt}",

        ":framework-sdkextensions{.module-lib.removed-api.txt}",

        ":framework-statsd{.module-lib.removed-api.txt}",

        ":framework-tethering{.module-lib.removed-api.txt}",

        ":framework-wifi{.module-lib.removed-api.txt}",

        ":non-updatable-module-lib-removed.txt",

    ],

    out: ["module-lib-removed.txt"],

    tools: ["metalava"],

    cmd: "$(location metalava) --no-banner --format=v2 $(in) --api $(out)",

}

non-updatable-api/Android.bp

+0 −18
Original line number Diff line number Diff line
@@ -22,32 +22,14 @@ filegroup { 
    visibility: ["//frameworks/base/api"],

}



filegroup {

    name: "non-updatable-removed.txt",

    srcs: ["removed.txt"],

    visibility: ["//frameworks/base/api"],

}



filegroup {

    name: "non-updatable-system-current.txt",

    srcs: ["system-current.txt"],

    visibility: ["//frameworks/base/api"],

}



filegroup {

    name: "non-updatable-system-removed.txt",

    srcs: ["system-removed.txt"],

    visibility: ["//frameworks/base/api"],

}



filegroup {

    name: "non-updatable-module-lib-current.txt",

    srcs: ["module-lib-current.txt"],

    visibility: ["//frameworks/base/api"],

}
 


filegroup {

    name: "non-updatable-module-lib-removed.txt",

    srcs: ["module-lib-removed.txt"],

    visibility: ["//frameworks/base/api"],

}