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

Commit 7ddc8772 authored by Makoto Onuki's avatar Makoto Onuki
Browse files

Partial cherry-pick of I46f0c0e238a6 

Tweak ravenwood build files

Test: TODO
Flag: EXEMPT host side test change only
Bug: 292141694

Test: $ANDROID_BUILD_TOP/frameworks/base/ravenwood/scripts/run-ravenwood-tests.sh

Merged-in: I46f0c0e238a6d7f8dc1a30cf111296a529c83664
Change-Id: I5d9f9d537fad3273e7a0f89d6422e220fd1b42f6
parent 7832229f

Ravenwood.bp

+12 −12
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ java_genrule { 
    name: "framework-minus-apex.ravenwood-base",

    tools: ["hoststubgen"],

    cmd: "$(location hoststubgen) " +

        "@$(location ravenwood/ravenwood-standard-options.txt) " +

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



        "--debug-log $(location hoststubgen_framework-minus-apex.log) " +

        "--stats-file $(location hoststubgen_framework-minus-apex_stats.csv) " +
@@ -41,13 +41,13 @@ java_genrule { 
        "--gen-input-dump-file $(location hoststubgen_dump.txt) " +



        "--in-jar $(location :framework-minus-apex-for-hoststubgen) " +

        "--policy-override-file $(location ravenwood/framework-minus-apex-ravenwood-policies.txt) " +

        "--annotation-allowed-classes-file $(location ravenwood/ravenwood-annotation-allowed-classes.txt) ",

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

        "--annotation-allowed-classes-file $(location :ravenwood-annotation-allowed-classes) ",

    srcs: [

        ":framework-minus-apex-for-hoststubgen",

        "ravenwood/framework-minus-apex-ravenwood-policies.txt",

        "ravenwood/ravenwood-standard-options.txt",

        "ravenwood/ravenwood-annotation-allowed-classes.txt",

        ":ravenwood-framework-policies",

        ":ravenwood-standard-options",

        ":ravenwood-annotation-allowed-classes",

    ],

    out: [

        "ravenwood.jar",
@@ -91,7 +91,7 @@ java_genrule { 
    name: "services.core.ravenwood-base",

    tools: ["hoststubgen"],

    cmd: "$(location hoststubgen) " +

        "@$(location ravenwood/ravenwood-standard-options.txt) " +

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



        "--debug-log $(location hoststubgen_services.core.log) " +

        "--stats-file $(location hoststubgen_services.core_stats.csv) " +
@@ -102,13 +102,13 @@ java_genrule { 
        "--gen-input-dump-file $(location hoststubgen_dump.txt) " +



        "--in-jar $(location :services.core-for-hoststubgen) " +

        "--policy-override-file $(location ravenwood/services.core-ravenwood-policies.txt) " +

        "--annotation-allowed-classes-file $(location ravenwood/ravenwood-annotation-allowed-classes.txt) ",

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

        "--annotation-allowed-classes-file $(location :ravenwood-annotation-allowed-classes) ",

    srcs: [

        ":services.core-for-hoststubgen",

        "ravenwood/services.core-ravenwood-policies.txt",

        "ravenwood/ravenwood-standard-options.txt",

        "ravenwood/ravenwood-annotation-allowed-classes.txt",

        ":ravenwood-services-policies",

        ":ravenwood-standard-options",

        ":ravenwood-annotation-allowed-classes",

    ],

    out: [

        "ravenwood.jar",

ravenwood/Android.bp

+33 −1
Original line number Diff line number Diff line
@@ -16,6 +16,38 @@ filegroup { 
    visibility: ["//visibility:public"],

}



filegroup {

    name: "ravenwood-services-policies",

    srcs: [

        "texts/ravenwood-services-policies.txt",

    ],

    visibility: ["//visibility:public"],

}



filegroup {

    name: "ravenwood-framework-policies",

    srcs: [

        "texts/ravenwood-framework-policies.txt",

    ],

    visibility: ["//visibility:public"],

}



filegroup {

    name: "ravenwood-standard-options",

    srcs: [

        "texts/ravenwood-standard-options.txt",

    ],

    visibility: ["//visibility:public"],

}



filegroup {

    name: "ravenwood-annotation-allowed-classes",

    srcs: [

        "texts/ravenwood-annotation-allowed-classes.txt",

    ],

    visibility: ["//visibility:public"],

}



java_library {

    name: "ravenwood-annotations-lib",

    srcs: [":ravenwood-annotations"],
@@ -151,6 +183,6 @@ java_device_for_host { 


filegroup {

    name: "ravenwood-services-jarjar-rules",

    srcs: ["ravenwood-services-jarjar-rules.txt"],

    srcs: ["texts/ravenwood-services-jarjar-rules.txt"],

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

}