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

Commit 2dd597d3 authored by Makoto Onuki's avatar Makoto Onuki Committed by Automerger Merge Worker
Browse files

Merge "Support StatsD Java API on Ravenwood (f/b)" into main am: 2ad448a1 

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



Change-Id: I1c7e66b6cbfb6395474b780abc99417504de5dd4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4cea8bb1 2ad448a1

ravenwood/Android.bp

+13 −0
Original line number Diff line number Diff line
@@ -319,6 +319,16 @@ sh_test_host { 
        ":services.core.ravenwood-base{hoststubgen_services.core_apis.csv}",

        ":services.core.ravenwood-base{hoststubgen_services.core_keep_all.txt}",

        ":services.core.ravenwood-base{hoststubgen_services.core_dump.txt}",



        ":framework-configinfrastructure.ravenwood-base{framework-configinfrastructure_stats.csv}",

        ":framework-configinfrastructure.ravenwood-base{framework-configinfrastructure_apis.csv}",

        ":framework-configinfrastructure.ravenwood-base{framework-configinfrastructure_keep_all.txt}",

        ":framework-configinfrastructure.ravenwood-base{framework-configinfrastructure_dump.txt}",



        ":framework-statsd.ravenwood-base{framework-statsd_stats.csv}",

        ":framework-statsd.ravenwood-base{framework-statsd_apis.csv}",

        ":framework-statsd.ravenwood-base{framework-statsd_keep_all.txt}",

        ":framework-statsd.ravenwood-base{framework-statsd_dump.txt}",

    ],

}
@@ -403,6 +413,9 @@ android_ravenwood_libgroup { 
        // DeviceConfig

        "framework-configinfrastructure.ravenwood",



        // StatsD

        "framework-statsd.ravenwood",



        // Provide runtime versions of utils linked in below

        "junit",

        "truth",

ravenwood/Framework.bp

+54 −0
Original line number Diff line number Diff line
@@ -344,3 +344,57 @@ java_genrule { 
        "framework-configinfrastructure.ravenwood.jar",

    ],

}



///////////////////////////////////

// framework-statsd

///////////////////////////////////



java_genrule {

    name: "framework-statsd.ravenwood-base",

    tools: ["hoststubgen"],

    cmd: "$(location hoststubgen) " +

        "@$(location :ravenwood-standard-options) " +



        "--debug-log $(location framework-statsd.log) " +

        "--stats-file $(location framework-statsd_stats.csv) " +

        "--supported-api-list-file $(location framework-statsd_apis.csv) " +

        "--gen-keep-all-file $(location framework-statsd_keep_all.txt) " +

        "--gen-input-dump-file $(location framework-statsd_dump.txt) " +



        "--out-impl-jar $(location ravenwood.jar) " +

        "--in-jar $(location :framework-statsd.impl{.jar}) " +



        "--policy-override-file $(location :ravenwood-common-policies) " +

        "--policy-override-file $(location :framework-statsd-ravenwood-policies) ",

    srcs: [

        ":framework-statsd.impl{.jar}",



        ":ravenwood-common-policies",

        ":framework-statsd-ravenwood-policies",

        ":ravenwood-standard-options",

    ],

    out: [

        "ravenwood.jar",



        // Following files are created just as FYI.

        "framework-statsd_keep_all.txt",

        "framework-statsd_dump.txt",



        "framework-statsd.log",

        "framework-statsd_stats.csv",

        "framework-statsd_apis.csv",

    ],

    visibility: ["//visibility:private"],

}



java_genrule {

    name: "framework-statsd.ravenwood",

    defaults: ["ravenwood-internal-only-visibility-genrule"],

    cmd: "cp $(in) $(out)",

    srcs: [

        ":framework-statsd.ravenwood-base{ravenwood.jar}",

    ],

    out: [

        "framework-statsd.ravenwood.jar",

    ],

}