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

Commit ccc36d6a authored by Anton Hansson's avatar Anton Hansson Committed by Automerger Merge Worker
Browse files

Merge "Add genrules for merged removed.txt files" am: 19189d88 am:... 

Merge "Add genrules for merged removed.txt files" am: 19189d88 am: 554cdd77 am: b16f6fed am: 41c5dbb0

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

Change-Id: Id35b4219ec4e944c80105e6008c12210036d40a7
parents 7a3481c3 41c5dbb0

api/Android.bp

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

    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 {

genrule {

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

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

    srcs: [

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

    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 {

genrule {

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

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

    srcs: [

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

    tools: ["metalava"],

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

    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

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

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

}

}





filegroup {

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

    srcs: ["removed.txt"],

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

}



filegroup {

filegroup {

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

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

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

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

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

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

}

}





filegroup {

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

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

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

}



filegroup {

filegroup {

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

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

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

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

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

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

}

}



filegroup {

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

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

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

}