Fix --annotation-allowed-classes-file, and start using it
Also add some presubmit tests as a smoke test.
Bug: 292141694
Test: run-all-tests.sh
Test: atest --no-bazel-mode CtsUtilTestCasesRavenwood
Change-Id: I30569313b764dfa30db9c2c5627050da4a6a1d67
diff --git a/Ravenwood.bp b/Ravenwood.bp
index 3310898..2f67090 100644
--- a/Ravenwood.bp
+++ b/Ravenwood.bp
@@ -30,7 +30,7 @@
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 @@
"--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",