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

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

Merge "Dist the merged api txts for normal builds too" am: 208cdcbf am:... 

Merge "Dist the merged api txts for normal builds too" am: 208cdcbf am: a1e66b4d am: 4b0e3f92 am: d9d3a6ce

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

Change-Id: I5c25656990432c01628ccdabd44a10da8bdf114f
parents 7cef3635 d9d3a6ce

api/Android.bp

+57 −15
Original line number Diff line number Diff line
@@ -62,11 +62,18 @@ genrule { 
    out: ["current.txt"],

    tools: ["metalava"],

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

    dist: {

    dists: [

        {

            targets: ["droidcore"],

            dir: "api",

            dest: "current.txt",

        },

        {

            targets: ["sdk", "win_sdk"],

            dir: "apistubs/android/public/api",

            dest: "android.txt",

        },

    ],

}



genrule {
@@ -87,6 +94,13 @@ genrule { 
    out: ["removed.txt"],

    tools: ["metalava"],

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

    dists: [

        {

            targets: ["droidcore"],

            dir: "api",

            dest: "removed.txt",

        },

    ],

}



genrule {
@@ -106,11 +120,18 @@ genrule { 
    out: ["system-current.txt"],

    tools: ["metalava"],

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

    dist: {

    dists: [

        {

            targets: ["droidcore"],

            dir: "api",

            dest: "system-current.txt",

        },

        {

            targets: ["sdk", "win_sdk"],

            dir: "apistubs/android/system/api",

            dest: "android.txt",

        },

    ],

}



genrule {
@@ -130,6 +151,13 @@ genrule { 
    out: ["system-removed.txt"],

    tools: ["metalava"],

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

    dists: [

        {

            targets: ["droidcore"],

            dir: "api",

            dest: "system-removed.txt",

        },

    ],

}



genrule {
@@ -149,11 +177,18 @@ genrule { 
    out: ["module-lib-current.txt"],

    tools: ["metalava"],

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

    dist: {

    dists: [

        {

            targets: ["droidcore"],

            dir: "api",

            dest: "module-lib-current.txt",

        },

        {

            targets: ["sdk", "win_sdk"],

            dir: "apistubs/android/module-lib/api",

            dest: "android.txt",

        },

    ],

}



genrule {
@@ -173,6 +208,13 @@ genrule { 
    out: ["module-lib-removed.txt"],

    tools: ["metalava"],

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

    dists: [

        {

            targets: ["droidcore"],

            dir: "api",

            dest: "module-lib-removed.txt",

        },

    ],

}



genrule {