Refactor test 983 to prepare for inclusion in CTS
In order for test 983 to be included in CTS we needed to make changes
to remove its custom Agent_OnLoad and ensure that all printing is done
through System.out.
Test: ./test.py --host -j50
Bug: 73252141
Change-Id: If18e58305a1a4dd7d915fabfbacbe95c8212e801
diff --git a/test/Android.bp b/test/Android.bp
index 5f39ffe..8b88b09 100644
--- a/test/Android.bp
+++ b/test/Android.bp
@@ -238,6 +238,7 @@
"931-agent-thread/agent_thread.cc",
"933-misc-events/misc_events.cc",
"945-obsolete-native/obsolete_native.cc",
+ "983-source-transform-verify/source_transform.cc",
"984-obsolete-invoke/obsolete_invoke.cc",
"986-native-method-bind/native_bind.cc",
"987-agent-bind/agent_bind.cc",
@@ -288,7 +289,6 @@
"909-attach-agent/attach.cc",
"912-classes/classes_art.cc",
"936-search-onload/search_onload.cc",
- "983-source-transform-verify/source_transform.cc",
"1940-ddms-ext/ddm_ext.cc",
"1944-sudden-exit/sudden_exit.cc",
],
@@ -329,6 +329,13 @@
shared_libs: [
"liblog",
],
+ header_libs: [
+ // This is needed to resolve the base/ header file in libdexfile. Unfortunately there are
+ // many problems with how we export headers that are making doing this the 'right' way
+ // difficult.
+ // TODO: move those headers to art/ rather than under runtime.
+ "libart_runtime_headers",
+ ],
export_include_dirs: ["ti-agent"],
}