1 files changed, 29 insertions, 12 deletions

diff --git a/compiler/Android.bp b/compiler/Android.bp
index de98fdb993..a879bd8f06 100644
--- a/compiler/Android.bp
+++ b/compiler/Android.bp
@@ -33,11 +33,8 @@ art_cc_defaults {
     defaults: ["art_defaults"],
     host_supported: true,
     srcs: [
-        "compiled_method.cc",
         "debug/elf_debug_writer.cc",
         "dex/inline_method_analyser.cc",
-        "dex/verification_results.cc",
-        "driver/compiled_method_storage.cc",
         "driver/compiler_options.cc",
         "driver/dex_compilation_unit.cc",
         "jit/jit_compiler.cc",
@@ -94,10 +91,10 @@ art_cc_defaults {
         "optimizing/ssa_phi_elimination.cc",
         "optimizing/stack_map_stream.cc",
         "optimizing/superblock_cloner.cc",
+        "optimizing/write_barrier_elimination.cc",
         "trampolines/trampoline_compiler.cc",
         "utils/assembler.cc",
         "utils/jni_macro_assembler.cc",
-        "utils/swap_space.cc",
         "compiler.cc",
     ],
 
@@ -133,6 +130,11 @@ art_cc_defaults {
                 "utils/arm64/managed_register_arm64.cc",
             ],
         },
+        riscv64: {
+            srcs: [
+                "utils/riscv64/managed_register_riscv64.cc",
+            ],
+        },
         x86: {
             srcs: [
                 "jni/quick/x86/calling_convention_x86.cc",
@@ -176,6 +178,8 @@ art_cc_defaults {
     ],
 
     export_include_dirs: ["."],
+    // Not using .map.txt because this is an internal API
+    version_script: "libart-compiler.map",
 }
 
 cc_defaults {
@@ -228,7 +232,7 @@ art_cc_library {
         "libprofile",
         "libdexfile",
     ],
-    whole_static_libs: ["libelffile"],
+    static_libs: ["libelffile"],
     runtime_libs: [
         // `art::HGraphVisualizerDisassembler::HGraphVisualizerDisassembler` may dynamically load
         // `libart-disassembler.so`.
@@ -245,6 +249,7 @@ art_cc_library {
     apex_available: [
         "com.android.art",
         "com.android.art.debug",
+        "test_broken_com.android.art",
     ],
 }
 
@@ -296,7 +301,7 @@ art_cc_library {
         "libprofiled",
         "libdexfiled",
     ],
-    whole_static_libs: ["libelffiled"],
+    static_libs: ["libelffiled"],
     runtime_libs: [
         // `art::HGraphVisualizerDisassembler::HGraphVisualizerDisassembler` may dynamically load
         // `libartd-disassembler.so`.
@@ -369,6 +374,7 @@ art_cc_defaults {
     data: [
         ":art-gtest-jars-ExceptionHandle",
         ":art-gtest-jars-Interfaces",
+        ":art-gtest-jars-Main",
         ":art-gtest-jars-MyClassNatives",
     ],
     tidy_timeout_srcs: [
@@ -381,9 +387,9 @@ art_cc_defaults {
         "optimizing/ssa_test.cc",
     ],
     srcs: [
+        "compiler_reflection_test.cc",
         "debug/dwarf/dwarf_test.cc",
         "debug/src_map_elem_test.cc",
-        "driver/compiled_method_storage_test.cc",
         "exception_test.cc",
         "jni/jni_compiler_test.cc",
         "linker/linker_patch_test.cc",
@@ -419,7 +425,6 @@ art_cc_defaults {
         "optimizing/suspend_check_test.cc",
         "utils/atomic_dex_ref_map_test.cc",
         "utils/dedupe_set_test.cc",
-        "utils/swap_space_test.cc",
 
         "jni/jni_cfi_test.cc",
         "optimizing/codegen_test.cc",
@@ -442,6 +447,11 @@ art_cc_defaults {
                 "utils/arm64/managed_register_arm64_test.cc",
             ],
         },
+        riscv64: {
+            srcs: [
+                "utils/riscv64/managed_register_riscv64_test.cc",
+            ],
+        },
         x86: {
             srcs: [
                 "utils/x86/managed_register_x86_test.cc",
@@ -465,8 +475,8 @@ art_cc_defaults {
     ],
 
     shared_libs: [
-        "libbacktrace",
         "libnativeloader",
+        "libunwindstack",
     ],
 
     target: {
@@ -488,10 +498,12 @@ art_cc_test {
     ],
     shared_libs: [
         "libprofiled",
-        "libartd-compiler",
         "libartd-simulator-container",
+        "liblzma",
     ],
     static_libs: [
+        "libartd-compiler",
+        "libelffiled",
         "libvixld",
     ],
 }
@@ -506,7 +518,8 @@ art_cc_test {
     data: [":generate-boot-image"],
     shared_libs: [
         "libprofile",
-        "libart-compiler",
+        "liblzma",
+        "libartpalette",
     ],
     static_libs: [
         // For now, link `libart-simulator-container` statically for simplicity,
@@ -515,6 +528,8 @@ art_cc_test {
         // TODO(b/192070541): Consider linking `libart-simulator-container`
         // dynamically.
         "libart-simulator-container",
+        "libart-compiler",
+        "libelffile",
         "libvixl",
     ],
     test_config: "art_standalone_compiler_tests.xml",
@@ -548,9 +563,11 @@ art_cc_test {
         },
     },
     shared_libs: [
-        "libartd-compiler",
+        "liblzma",
     ],
     static_libs: [
+        "libartd-compiler",
+        "libelffiled",
         "libvixld",
     ],
 }