diff options
| author | Pirama Arumuga Nainar <pirama@google.com> | 2017-11-09 21:59:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-11-09 21:59:55 +0000 |
| commit | 4c2609f8188112a8aad7a287d43cc545386a84d5 (patch) | |
| tree | 10ef138d54f838bcbdfc7a6dc4f2cd7dea0c7f64 | |
| parent | 7693cd9c5db4ecf5af5e23e3057006d568a68279 (diff) | |
| parent | c6f1de7833a981d897206cde09b43e7bad1df260 (diff) | |
| download | llvm-o-mr1-iot-preview-6.tar.gz | |
Merge "Remove libLLVM.so and disable some host tools"android-o-mr1-iot-preview-6o-mr1-iot-preview-6
| -rw-r--r-- | Android.bp | 14 | ||||
| -rw-r--r-- | tools/gold/Android.bp | 6 | ||||
| -rw-r--r-- | tools/llvm-ar/Android.bp | 6 | ||||
| -rw-r--r-- | tools/llvm-symbolizer/Android.bp | 2 |
4 files changed, 15 insertions, 13 deletions
diff --git a/Android.bp b/Android.bp index f97f88bf4d11..cb18605d92f1 100644 --- a/Android.bp +++ b/Android.bp @@ -201,9 +201,9 @@ llvm_aarch64_static_libraries = [ "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_defaults { }, } -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 e7cd79a28e67..dd2b134805b7 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 @@ cc_library_host_shared { 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 2cf51571b5f3..d28fa424a156 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 @@ cc_binary_host { "llvm-ranlib", ], } +*/ diff --git a/tools/llvm-symbolizer/Android.bp b/tools/llvm-symbolizer/Android.bp index c5a1c1bed14a..e4e4af168a64 100644 --- a/tools/llvm-symbolizer/Android.bp +++ b/tools/llvm-symbolizer/Android.bp @@ -18,7 +18,7 @@ cc_binary { ], }, android: { - shared_libs: ["libLLVM"], + shared_libs: ["libLLVM_android"], }, }, } |