Wrap expected_cts_outputs in a java_library
Renamed expected_cts_outputs to expected_cts_outputs_gen and add a
java_library called expected_cts_outputs which statically includes the
contents of expected_cts_outputs_gen.
This allows expected_cts_outputs to be easily added to
art-module-tests-exports.
Bug: 142935992
Test: m droid
manually inspect contents of CtsJvmtiDeviceRunTestAppBase to
ensure that they had not changed.
Change-Id: I7c2d61e06a0388e03295ecc08958d185f3651ed2
diff --git a/test/Android.bp b/test/Android.bp
index 86205e3..024e55e 100644
--- a/test/Android.bp
+++ b/test/Android.bp
@@ -776,10 +776,7 @@
// source tree each expected test result is in the NN-xxxx/expected.txt.
// Copy+rename them them to a temporary directory and them zip them.
java_genrule {
- name: "expected_cts_outputs",
- visibility: [
- "//cts/hostsidetests/jvmti:__subpackages__",
- ],
+ name: "expected_cts_outputs_gen",
srcs: [
"901-hello-ti-agent/expected.txt",
"902-hello-transformation/expected.txt",
@@ -917,6 +914,20 @@
"$(location soong_zip) -o $(out) -C $(genDir)/res -D $(genDir)/res",
}
+// Wrap the expected_cts_outputs_gen inside a java library to make it easy
+// to export as a member of a module_exports.
+java_library {
+ name: "expected_cts_outputs",
+ visibility: [
+ "//art/build/sdk",
+ "//cts/hostsidetests/jvmti:__subpackages__",
+ ],
+ static_libs: [
+ "expected_cts_outputs_gen",
+ ],
+ sdk_version: "core_current",
+}
+
art_cc_test {
name: "ArtGtestsTarget",
data: [