ART: Refactor run-test 983 dex verification
Split the source for use in run-tests (using libdexfile) and
CTS (using slicer). In preparation for compilation with the
NDK.
Test: m test-art-host
Test: m cts
Change-Id: Ie514445d90c77391ec685b53726f1f9dd50f1991
diff --git a/test/Android.bp b/test/Android.bp
index 8b88b09..77160d3 100644
--- a/test/Android.bp
+++ b/test/Android.bp
@@ -289,6 +289,7 @@
"909-attach-agent/attach.cc",
"912-classes/classes_art.cc",
"936-search-onload/search_onload.cc",
+ "983-source-transform-verify/source_transform_art.cc",
"1940-ddms-ext/ddm_ext.cc",
"1944-sudden-exit/sudden_exit.cc",
],
@@ -313,21 +314,19 @@
shared_libs: ["libartd"],
}
-art_cc_test_library {
+cc_library_static {
name: "libctstiagent",
defaults: ["libtiagent-base-defaults"],
+ host_supported: false,
+ srcs: [
+ "983-source-transform-verify/source_transform_slicer.cc",
+ ],
whole_static_libs: [
- "libdexfile",
- "libz",
- "libziparchive",
+ "slicer",
+ "libz", // for slicer (using adler32).
],
static_libs: [
"libbase",
- "libcutils",
- "libutils",
- ],
- shared_libs: [
- "liblog",
],
header_libs: [
// This is needed to resolve the base/ header file in libdexfile. Unfortunately there are