diff options
Diffstat (limited to 'runtime/Android.bp')
| -rw-r--r-- | runtime/Android.bp | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/runtime/Android.bp b/runtime/Android.bp index 9e0e78ebdb..d42848f678 100644 --- a/runtime/Android.bp +++ b/runtime/Android.bp @@ -130,7 +130,7 @@ libart_cc_defaults { "exec_utils.cc", "fault_handler.cc", "gc/allocation_record.cc", - "gc/allocator/dlmalloc.cc", + "gc/allocator/art-dlmalloc.cc", "gc/allocator/rosalloc.cc", "gc/accounting/bitmap.cc", "gc/accounting/card_table.cc", @@ -142,6 +142,7 @@ libart_cc_defaults { "gc/collector/garbage_collector.cc", "gc/collector/immune_region.cc", "gc/collector/immune_spaces.cc", + "gc/collector/mark_compact.cc", "gc/collector/mark_sweep.cc", "gc/collector/partial_mark_sweep.cc", "gc/collector/semi_space.cc", @@ -173,7 +174,6 @@ libart_cc_defaults { "interpreter/interpreter.cc", "interpreter/interpreter_cache.cc", "interpreter/interpreter_common.cc", - "interpreter/interpreter_intrinsics.cc", "interpreter/interpreter_switch_impl0.cc", "interpreter/interpreter_switch_impl1.cc", "interpreter/interpreter_switch_impl2.cc", @@ -209,6 +209,7 @@ libart_cc_defaults { "mirror/method_handles_lookup.cc", "mirror/method_type.cc", "mirror/object.cc", + "mirror/stack_frame_info.cc", "mirror/stack_trace_element.cc", "mirror/string.cc", "mirror/throwable.cc", @@ -225,6 +226,7 @@ libart_cc_defaults { "native/dalvik_system_ZygoteHooks.cc", "native/java_lang_Class.cc", "native/java_lang_Object.cc", + "native/java_lang_StackStreamFactory.cc", "native/java_lang_String.cc", "native/java_lang_StringFactory.cc", "native/java_lang_System.cc", @@ -254,6 +256,7 @@ libart_cc_defaults { "oat.cc", "oat_file.cc", "oat_file_assistant.cc", + "oat_file_assistant_context.cc", "oat_file_manager.cc", "oat_quick_method_header.cc", "object_lock.cc", @@ -415,7 +418,6 @@ libart_cc_defaults { ], static_libs: [ "libstatslog_art", - "libtinyxml2", ], generated_sources: [ "apex-info-list-tinyxml", @@ -456,17 +458,20 @@ libart_cc_defaults { header_libs: [ "art_cmdlineparser_headers", "cpp-define-generator-definitions", + "dlmalloc", "jni_platform_headers", "libart_headers", "libnativehelper_header_only", ], - export_header_lib_headers: ["libart_headers"], + export_header_lib_headers: [ + "dlmalloc", + "libart_headers", + ], whole_static_libs: [ "libcpu_features", ], shared_libs: [ "libartpalette", - "libbacktrace", "libbase", // For common macros. "liblog", "liblz4", @@ -496,7 +501,6 @@ libart_static_cc_defaults { name: "libart_static_base_defaults", whole_static_libs: [ "libartpalette", - "libbacktrace", "libbase", "liblog", "liblz4", @@ -679,6 +683,7 @@ art_cc_defaults { ], shared_libs: [ "libbase", + "libziparchive", ], static_libs: [ "libprocinfo", @@ -848,7 +853,11 @@ art_cc_defaults { "verifier/reg_type_test.cc", ], shared_libs: [ - "libbacktrace", + "libunwindstack", + "libziparchive", + ], + static_libs: [ + "libgmock", ], header_libs: [ "art_cmdlineparser_headers", // For parsed_options_test. @@ -877,6 +886,7 @@ art_cc_test { "art_standalone_gtest_defaults", "art_runtime_tests_defaults", ], + data: [":generate-boot-image"], target: { host: { required: ["dex2oat"], @@ -930,6 +940,7 @@ art_cc_test { "art_standalone_gtest_defaults", "art_runtime_compiler_tests_defaults", ], + data: [":generate-boot-image"], shared_libs: [ "libart-compiler", ], |