Remove libLLVM.so and disable some host tools
Bug: http://b/64121881
Remove the libLLVM.so module (and retain libLLVM_android.so).
Simplify the declarations now that there's only one variant.
Tools llvm-ar and LLVMgold.so are disabled instead of having them depend
on libLLVM_android.so. It is no longer necessary to build them in the
external/llvm project.
Test: aosp_marlin checkbuild with FORCE_BUILD_LLVM_COMPONENTS set and
unset.
Change-Id: Ib9cff7a05eab731a59e4c0d05894931983997ef5
diff --git a/Android.bp b/Android.bp
index f97f88b..cb18605 100644
--- a/Android.bp
+++ b/Android.bp
@@ -201,9 +201,9 @@
"libLLVMAArch64Disassembler",
]
-cc_defaults {
+cc_library_shared {
host_supported: true,
- name: "libLLVM-defaults",
+ name: "libLLVM_android",
defaults: [
"llvm-defaults",
"force_build_llvm_components",
@@ -301,16 +301,6 @@
},
}
-cc_library_shared {
- name: "libLLVM",
- defaults: ["libLLVM-defaults"],
-}
-
-cc_library_shared {
- name: "libLLVM_android",
- defaults: ["libLLVM-defaults"],
-}
-
subdirs = [
"soong",
"lib",
diff --git a/tools/gold/Android.bp b/tools/gold/Android.bp
index e7cd79a..dd2b134 100644
--- a/tools/gold/Android.bp
+++ b/tools/gold/Android.bp
@@ -17,6 +17,11 @@
// For the host only
// =====================================================
+/*
+// This module is disabled while switching the name of libLLVM for the target
+// (and host renderscript tools) to libLLVM_android.so. This tool need not be
+// built in Android build system as we move to the toolchain branch. Leaving
+// the file here for posterity.
cc_library_host_shared {
name: "LLVMgold",
defaults: ["llvm-defaults"],
@@ -25,3 +30,4 @@
include_dirs: ["toolchain/binutils/binutils-2.27/include"],
compile_multilib: "first",
}
+*/
diff --git a/tools/llvm-ar/Android.bp b/tools/llvm-ar/Android.bp
index 2cf5157..d28fa42 100644
--- a/tools/llvm-ar/Android.bp
+++ b/tools/llvm-ar/Android.bp
@@ -2,6 +2,11 @@
// llvm-ar command line tool
//===---------------------------------------------------------------===
+/*
+// This module is disabled while switching the name of libLLVM for the target
+// (and host renderscript tools) to libLLVM_android.so. This tool need not be
+// built in Android build system as we move to the toolchain branch. Leaving
+// the file here for posterity.
cc_binary_host {
name: "llvm-ar",
defaults: ["llvm-defaults"],
@@ -12,3 +17,4 @@
"llvm-ranlib",
],
}
+*/
diff --git a/tools/llvm-symbolizer/Android.bp b/tools/llvm-symbolizer/Android.bp
index c5a1c1b..e4e4af1 100644
--- a/tools/llvm-symbolizer/Android.bp
+++ b/tools/llvm-symbolizer/Android.bp
@@ -18,7 +18,7 @@
],
},
android: {
- shared_libs: ["libLLVM"],
+ shared_libs: ["libLLVM_android"],
},
},
}
