diff options
Diffstat (limited to 'test/Android.bp')
| -rw-r--r-- | test/Android.bp | 71 |
1 files changed, 51 insertions, 20 deletions
diff --git a/test/Android.bp b/test/Android.bp index 72e8eee95a..25556adf65 100644 --- a/test/Android.bp +++ b/test/Android.bp @@ -62,7 +62,7 @@ art_cc_defaults { "libvixld-arm", "libvixld-arm64", "libart-gtest", - "libdexfile", + "libdexfiled", "libbase", "libicuuc", @@ -114,7 +114,7 @@ art_cc_defaults { shared_libs: [ "libartd", "libartd-compiler", - "libdexfile", + "libdexfiled", ], static_libs: [ "libgtest", @@ -151,7 +151,7 @@ art_cc_library { shared_libs: [ "libartd", "libartd-compiler", - "libdexfile", + "libdexfiled", "libbase", "libbacktrace", ], @@ -238,6 +238,7 @@ art_cc_defaults { "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", @@ -267,12 +268,8 @@ art_cc_defaults { "1942-suspend-raw-monitor-exit/native_suspend_monitor.cc", "1943-suspend-raw-monitor-wait/native_suspend_monitor.cc", ], - shared_libs: [ - "libdexfile", - "libbase", - ], header_libs: [ - "libnativehelper_header_only", + "jni_headers", "libopenjdkjvmti_headers", ], include_dirs: ["art/test/ti-agent"], @@ -292,15 +289,21 @@ art_cc_defaults { "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", + ], + shared_libs: [ + "libbase", ], } art_cc_test_library { name: "libtiagent", defaults: ["libtiagent-defaults"], - shared_libs: ["libart"], + shared_libs: [ + "libart", + "libdexfile", + ], } art_cc_test_library { @@ -309,7 +312,36 @@ art_cc_test_library { "art_debug_defaults", "libtiagent-defaults", ], - shared_libs: ["libartd"], + shared_libs: [ + "libartd", + "libdexfiled", + ], +} + +art_cc_test_library { + name: "libctstiagent", + defaults: ["libtiagent-base-defaults"], + whole_static_libs: [ + "libdexfile", + "libz", + "libziparchive", + ], + static_libs: [ + "libbase", + "libcutils", + "libutils", + ], + 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"], } art_cc_defaults { @@ -340,12 +372,6 @@ art_cc_test_library { shared_libs: ["libartd"], } -art_cc_test_library { - name: "libctstiagent", - defaults: ["libtiagent-base-defaults"], - export_include_dirs: ["ti-agent"], -} - cc_defaults { name: "libarttest-defaults", defaults: [ @@ -399,7 +425,6 @@ cc_defaults { "708-jit-cache-churn/jit.cc", ], shared_libs: [ - "libdexfile", "libbacktrace", "libbase", "libnativehelper", @@ -409,7 +434,10 @@ cc_defaults { art_cc_test_library { name: "libarttest", defaults: ["libarttest-defaults"], - shared_libs: ["libart"], + shared_libs: [ + "libart", + "libdexfile", + ], } art_cc_test_library { @@ -418,7 +446,10 @@ art_cc_test_library { "art_debug_defaults", "libarttest-defaults", ], - shared_libs: ["libartd"], + shared_libs: [ + "libartd", + "libdexfiled", + ], } art_cc_test_library { |