android: [ORC] Move OrcError.h to include/llvm/ExecutionEngine/Orc/Shared.

Porting of commit
24672ddea3c9 ("[ORC] Move OrcError.h to include/llvm/ExecutionEngine/Orc/Shared.")

Fixes the following building errors:

ld.lld: error: undefined symbol: llvm::orc::orcError(llvm::orc::OrcErrorCode)
>>> referenced by Core.cpp:70 (external/llvm-project/llvm/lib/ExecutionEngine/Orc/Core.cpp:70)
>>>               Core.o:(llvm::orc::ResourceTrackerDefunct::convertToErrorCode() const) in archive out/soong/.intermediates/external/llvm-project/llvm/lib/ExecutionEngine/Orc/libLLVM12OrcJIT/android_x86_64_core_static/libLLVM12OrcJIT.a
...
ld.lld: error: undefined symbol: llvm::orc::DuplicateDefinition::DuplicateDefinition(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >)
>>> referenced by memory:3132 (external/libcxx/include/memory:3132)
>>>               Core.o:(llvm::orc::JITDylib::defineMaterializing(llvm::DenseMap<llvm::orc::SymbolStringPtr, llvm::JITSymbolFlags, llvm::DenseMapInfo<llvm::orc::SymbolStringPtr>, llvm::detail::DenseMapPair<llvm::orc::SymbolStringPtr, llvm::JITSymbolFlags> >)) in archive out/soong/.intermediates/external/llvm-project/llvm/lib/ExecutionEngine/Orc/libLLVM12OrcJIT/android_x86_64_core_static/libLLVM12OrcJIT.a

diff --git a/llvm/Android.bp b/llvm/Android.bp
index 2cca1a4..c24da2c 100644 (file)
--- a/llvm/Android.bp
+++ b/llvm/Android.bp
@@ -326,9 +326,9 @@ cc_library_shared {
         "libLLVMCoroutines",
         "libLLVMTextAPI",
         "libLLVMCFGuard",
-        "libLLVMOrcError",
         "libLLVMFrontendOpenMP",
         "libLLVMHelloNew",
+        "libLLVMOrcShared",
     ],
 
     export_include_dirs: ["include"],

diff --git a/llvm/lib/ExecutionEngine/OrcError/Android.bp b/llvm/lib/ExecutionEngine/Orc/Shared/Android.bp
similarity index 76%
rename from llvm/lib/ExecutionEngine/OrcError/Android.bp
rename to llvm/lib/ExecutionEngine/Orc/Shared/Android.bp
index 3e7cafd..5e54972 100644 (file)
--- a/llvm/lib/ExecutionEngine/OrcError/Android.bp
+++ b/llvm/lib/ExecutionEngine/Orc/Shared/Android.bp
@@ -1,5 +1,5 @@
 cc_library_static {
-    name: "libLLVMOrcError",
+    name: "libLLVMOrcShared",
     defaults: [
         "llvm-lib-defaults",
     ],