From 61b1c151163a09ad49c0b74c19ee84caeb4d0345 Mon Sep 17 00:00:00 2001 From: Dmitrii Ishcheikin Date: Tue, 22 Aug 2023 23:50:44 +0000 Subject: Revert^3 "Merge libart and libart-compiler into a single library" This reverts commit 4617cc65933921f40b8dd09ad630850a984486c7. Reason for revert: app startup regressions b/296703167 b/295363008 Change-Id: Ib31df00f80c57b9c86d6d0254e795b9ad6e22e00 --- compiler/optimizing/graph_visualizer.cc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'compiler/optimizing/graph_visualizer.cc') diff --git a/compiler/optimizing/graph_visualizer.cc b/compiler/optimizing/graph_visualizer.cc index c2c0953044..bd33fde907 100644 --- a/compiler/optimizing/graph_visualizer.cc +++ b/compiler/optimizing/graph_visualizer.cc @@ -115,9 +115,7 @@ std::ostream& operator<<(std::ostream& os, const StringList& list) { } } -// On target: load `libart-disassembler` only when required (to save on memory). -// On host: `libart-disassembler` should be linked directly (either as a static or dynamic lib) -#ifdef ART_TARGET +#ifndef ART_STATIC_LIBART_COMPILER using create_disasm_prototype = Disassembler*(InstructionSet, DisassemblerOptions*); #endif @@ -127,7 +125,7 @@ class HGraphVisualizerDisassembler { const uint8_t* base_address, const uint8_t* end_address) : instruction_set_(instruction_set), disassembler_(nullptr) { -#ifdef ART_TARGET +#ifndef ART_STATIC_LIBART_COMPILER constexpr const char* libart_disassembler_so_name = kIsDebugBuild ? "libartd-disassembler.so" : "libart-disassembler.so"; libart_disassembler_handle_ = dlopen(libart_disassembler_so_name, RTLD_NOW); @@ -161,7 +159,7 @@ class HGraphVisualizerDisassembler { ~HGraphVisualizerDisassembler() { // We need to call ~Disassembler() before we close the library. disassembler_.reset(); -#ifdef ART_TARGET +#ifndef ART_STATIC_LIBART_COMPILER if (libart_disassembler_handle_ != nullptr) { dlclose(libart_disassembler_handle_); } @@ -186,7 +184,7 @@ class HGraphVisualizerDisassembler { InstructionSet instruction_set_; std::unique_ptr disassembler_; -#ifdef ART_TARGET +#ifndef ART_STATIC_LIBART_COMPILER void* libart_disassembler_handle_; #endif }; -- cgit v1.2.3-59-g8ed1b