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

Commit fb1b57ba authored by Makoto Onuki's avatar Makoto Onuki Committed by Android (Google) Code Review
Browse files

Merge "Fix --annotation-allowed-classes-file, and start using it" into main

parents becf170a 743a58aa

Ravenwood.bp

+6 −4
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-standard-options) " +

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



        "--out-stub-jar $(location ravenwood_stub.jar) " +

        "--out-impl-jar $(location ravenwood.jar) " +
@@ -39,11 +39,13 @@ java_genrule { 
        "--gen-input-dump-file $(location hoststubgen_dump.txt) " +



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

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

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

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

    srcs: [

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

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

        ":ravenwood-standard-options",

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

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

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

    ],

    out: [

        "ravenwood.jar",

TEST_MAPPING

+11 −0
Original line number Diff line number Diff line
@@ -128,6 +128,17 @@ 
      ]

    }

  ],

  "postsubmit-ravenwood": [

    // TODO(ravenwood) promote it to presubmit

    // TODO: Enable it once the infra knows how to run it.

//    {

//      "name": "CtsUtilTestCasesRavenwood",

//      "file_patterns": [

//        "*Ravenwood*",

//        "*ravenwood*"

//      ]

//    }

  ],

  "postsubmit-managedprofile-stress": [

    {

      "name": "ManagedProfileLifecycleStressTest"

ravenwood/Android.bp

+0 −9
Original line number Diff line number Diff line
@@ -16,15 +16,6 @@ filegroup { 
    visibility: ["//visibility:public"],

}



// File that contains the standard command line arguments to hoststubgen.

filegroup {

    name: "ravenwood-standard-options",

    srcs: [

        "ravenwood-standard-options.txt",

    ],

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

}



java_library {

    name: "ravenwood-annotations-lib",

    srcs: [":ravenwood-annotations"],

ravenwood/TEST_MAPPING

0 → 100644
+7 −0
Original line number Diff line number Diff line 
{

    "presubmit": [

        // Let's only run this one as a smoke test.

        // TODO: Enable it once the infra knows how to run it.

        // { "name": "CtsUtilTestCasesRavenwood" }

    ]

}