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

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

Merge "Move the dist rules from monolithic to merged rules" am: 99398da5 

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

Change-Id: I6fbbea431b2d385036135491c509afc0db887571
parents 926d1ee8 99398da5

StubLibraries.bp

+0 −15
Original line number Diff line number Diff line
@@ -139,11 +139,6 @@ droidstubs { 
            baseline_file: "api/lint-baseline.txt",

        },

    },

    dist: {

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

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

        dest: "android.txt",

    },

    jdiff_enabled: true,

}
@@ -206,11 +201,6 @@ droidstubs { 
            baseline_file: "api/system-lint-baseline.txt",

        },

    },

    dist: {

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

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

        dest: "android.txt",

    },

    jdiff_enabled: true,

}
@@ -291,11 +281,6 @@ droidstubs { 
            baseline_file: "api/module-lib-lint-baseline.txt",

        },

    },

    dist: {

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

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

        dest: "android.txt",

    },

}



droidstubs {

api/Android.bp

+15 −0
Original line number Diff line number Diff line
@@ -60,6 +60,11 @@ genrule { 
    out: ["current.txt"],

    tools: ["metalava"],

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

    dist: {

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

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

        dest: "android.txt",

    },

}



genrule {
@@ -95,6 +100,11 @@ genrule { 
    out: ["system-current.txt"],

    tools: ["metalava"],

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

    dist: {

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

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

        dest: "android.txt",

    },

}



genrule {
@@ -129,6 +139,11 @@ genrule { 
    out: ["module-lib-current.txt"],

    tools: ["metalava"],

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

    dist: {

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

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

        dest: "android.txt",

    },

}



genrule {