DO NOT MERGE: android: translate soong build rules for libLLVM70

These changes are necessary to build external/llvm70 project
and avoid conflicts with external/llvm project
Changes in mesa main Android.mk are required for libLLVM70
shared library dependency and cflag -DHAVE_LLVM=0x0700

The changelog is described by means of modules and variables
which needed to be renamed:

 #rename the target shared library and all static libraries
find . -type f -name "*.bp" -exec sed -i 's/libLLVM/libLLVM70/g' {} +

 #rename the boostrap and contextual build paths
find . -type f -name "*.bp" -exec sed -i 's/soong\-llvm/\soong-llvm70/g' {} +
find . -type f -name "*.go" -exec sed -i 's/android\/soong\/llvm/android\/soong\/llvm70/g' {} +

 #rename force_build_llvm_components type and module name
find . -type f -name '*.bp' -exec sed -i 's/force_build_llvm_components/force_build_llvm70_components/g' {} +
find . -type f -name '*.go' -exec sed -i 's/force_build_llvm_components/force_build_llvm70_components/g' {} +

 #rename all module that gave 'already defined' error
find . -type f -name '*.bp' -exec sed -i 's/llvm-aarch64-defaults/llvm70-aarch64-defaults/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/llvm-aarch64-headers/llvm70-aarch64-headers/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/llvm-amdgpu-defaults/llvm70-amdgpu-defaults/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/llvm-amdgpu-headers/llvm70-amdgpu-headers/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/llvm-arm-defaults/llvm70-arm-defaults/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/llvm-arm-headers/llvm70-arm-headers/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/llvm-defaults/llvm70-defaults/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/llvm-defaults-no-generated-headers/llvm70-defaults-no-generated-headers/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/llvm-gen-aarch64/llvm70-gen-aarch64/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/llvm-gen-amdgpu/llvm70-gen-amdgpu/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/llvm-gen-r600/llvm70-gen-r600/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/llvm-gen-arm/llvm70-gen-arm/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/llvm-gen-attributes/llvm70-gen-attributes/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/llvm-gen-core/llvm70-gen-core/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/llvm-gen-intrinsics/llvm70-gen-intrinsics/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/llvm-gen-libdriver/llvm70-gen-libdriver/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/llvm-gen-mips/llvm70-gen-mips/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/llvm-gen-revision/llvm70-gen-revision/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/llvm-gen-x86/llvm70-gen-x86/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/llvm-headers/llvm70-headers/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/llvm-headers-no-generated-headers/llvm70-headers-no-generated-headers/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/llvm-lib-defaults/llvm70-lib-defaults/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/llvm-mips-defaults/llvm70-mips-defaults/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/llvm-mips-headers/llvm70-mips-headers/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/llvm-tblgen/llvm70-tblgen/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/llvm-x86-defaults/llvm70-x86-defaults/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/llvm-x86-headers/llvm70-x86-headers/g' {} +

 #rename llvm-gen-instcombine module
find . -type f -name '*.bp' -exec sed -i 's/llvm-gen-instcombine/llvm70-gen-instcombine/g' {} +

 #rename the binaries
find . -type f -name '*.bp' -exec sed -i 's/LLVMHello/LLVM70Hello/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/LLVMgold/LLVM70gold/g' {} +

 #rename the TableGen binary module and variable in different files
find . -type f -name '*.go' -exec sed -i 's/LLVM TableGen/LLVM70 TableGen/g' {} +
find . -type f -name '*.go' -exec sed -i 's/llvm-tblgen/llvm70-tblgen/g' {} +
find . -type f -name '*.go' -exec sed -i 's/llvmTblgen/llvm70Tblgen/g' {} +
find . -type f -name '*.go' -exec sed -i 's/tblgenRule/tblgenRule70/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/llvm_tblgen/llvm70_tblgen/g' {} +
find . -type f -name '*.go' -exec sed -i 's/llvm_tblgen/llvm70_tblgen/g' {} +
find . -type f -name 'tdtags' -exec sed -i 's/llvm-tblgen/llvm70-tblgen/g' {} +

 #rename the include paths
find . -type f -name '*.bp' -exec sed -i 's/external\/llvm/external\/llvm70/g' {} +
find . -type f -name '*.go' -exec sed -i 's/external\/llvm/external\/llvm70/g' {} +

 #rename package, registered types and llvm-config
find . -type f -name '*.go' -exec sed -i 's/package llvm/package llvm70/g' {} +
find . -type f -name '*.go' -exec sed -i 's/llvm_tblgen/llvm70_tblgen/g' {} +
find . -type f -name '*.go' -exec sed -i 's/llvm_defaults/llvm70_defaults/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/ llvm-config / llvm70-config /g' {} +
find . -type f -name '*.bp' -exec sed -i 's/"llvm-config"/"llvm70-config"/g' {} +
find . -type f -name '*.go' -exec sed -i 's/"llvm-config"/"llvm70-config"/g' {} +

diff --git a/Android.bp b/Android.bp
index c448a26..7893287 100644 (file)
--- a/Android.bp
+++ b/Android.bp
@@ -1,14 +1,14 @@
 cc_defaults {
-    name: "llvm-defaults",
-    defaults: ["llvm-defaults-no-generated-headers"],
-    header_libs: ["llvm-headers"],
+    name: "llvm70-defaults",
+    defaults: ["llvm70-defaults-no-generated-headers"],
+    header_libs: ["llvm70-headers"],
 }
 
 // This module defines all of the defaults used to compiled llvm, except for
 // the generated headers.  It is necessary to avoid a circular dependency
 // from the tblgen tool used to generate the headers to the generated headers.
 llvm_defaults {
-    name: "llvm-defaults-no-generated-headers",
+    name: "llvm70-defaults-no-generated-headers",
 
     host_supported: true,
     clang: true,
@@ -41,7 +41,7 @@ llvm_defaults {
         "-Wno-error=user-defined-warnings",
     ],
 
-    header_libs: ["llvm-headers-no-generated-headers"],
+    header_libs: ["llvm70-headers-no-generated-headers"],
 
     target: {
         android: {
@@ -96,7 +96,7 @@ llvm_defaults {
 }
 
 cc_library_headers {
-    name: "llvm-headers-no-generated-headers",
+    name: "llvm70-headers-no-generated-headers",
     vendor_available: true,
     host_supported: true,
     export_include_dirs: ["include"],
@@ -117,20 +117,20 @@ cc_library_headers {
 }
 
 cc_library_headers {
-    name: "llvm-headers",
+    name: "llvm70-headers",
     vendor_available: true,
     host_supported: true,
-    header_libs: ["llvm-headers-no-generated-headers"],
-    export_header_lib_headers: ["llvm-headers-no-generated-headers"],
+    header_libs: ["llvm70-headers-no-generated-headers"],
+    export_header_lib_headers: ["llvm70-headers-no-generated-headers"],
     generated_headers: [
-        "llvm-gen-attributes",
-        "llvm-gen-intrinsics",
-        "llvm-gen-revision",
+        "llvm70-gen-attributes",
+        "llvm70-gen-intrinsics",
+        "llvm70-gen-revision",
     ],
     export_generated_headers: [
-        "llvm-gen-attributes",
-        "llvm-gen-intrinsics",
-        "llvm-gen-revision",
+        "llvm70-gen-attributes",
+        "llvm70-gen-intrinsics",
+        "llvm70-gen-revision",
     ],
     target: {
         windows: {
@@ -139,14 +139,14 @@ cc_library_headers {
     },
 }
 
-llvm_tblgen {
-    name: "llvm-gen-attributes",
+llvm70_tblgen {
+    name: "llvm70-gen-attributes",
     in: "include/llvm/IR/Attributes.td",
     outs: ["llvm/IR/Attributes.inc"],
 }
 
-llvm_tblgen {
-    name: "llvm-gen-intrinsics",
+llvm70_tblgen {
+    name: "llvm70-gen-intrinsics",
     in: "include/llvm/IR/Intrinsics.td",
     outs: [
         "llvm/IR/IntrinsicEnums.inc",
@@ -155,15 +155,15 @@ llvm_tblgen {
 }
 
 genrule {
-    name: "llvm-gen-revision",
+    name: "llvm70-gen-revision",
     out: ["llvm/Support/VCSRevision.h"],
     srcs: [".git/logs/HEAD"],
     tool_files: ["git_sha1_gen.py"],
     cmd: "python $(location git_sha1_gen.py) --output $(out)",
 }
 
-force_build_llvm_components_defaults {
-    name: "force_build_llvm_components",
+force_build_llvm70_components_defaults {
+    name: "force_build_llvm70_components",
     // Host build disabled by soong/llvm.go unless FORCE_BUILD_LLVM_COMPONENTS
     // environment variable is set
 }
@@ -171,108 +171,108 @@ force_build_llvm_components_defaults {
 // LLVM shared library build
 
 llvm_arm_static_libraries = [
-    "libLLVMARMCodeGen",
-    "libLLVMARMAsmParser",
-    "libLLVMARMAsmPrinter",
-    "libLLVMARMInfo",
-    "libLLVMARMDesc",
-    "libLLVMARMDisassembler",
-    "libLLVMARMUtils",
+    "libLLVM70ARMCodeGen",
+    "libLLVM70ARMAsmParser",
+    "libLLVM70ARMAsmPrinter",
+    "libLLVM70ARMInfo",
+    "libLLVM70ARMDesc",
+    "libLLVM70ARMDisassembler",
+    "libLLVM70ARMUtils",
 ]
 
 llvm_x86_static_libraries = [
-    "libLLVMX86CodeGen",
-    "libLLVMX86Info",
-    "libLLVMX86Desc",
-    "libLLVMX86AsmParser",
-    "libLLVMX86AsmPrinter",
-    "libLLVMX86Utils",
-    "libLLVMX86Disassembler",
+    "libLLVM70X86CodeGen",
+    "libLLVM70X86Info",
+    "libLLVM70X86Desc",
+    "libLLVM70X86AsmParser",
+    "libLLVM70X86AsmPrinter",
+    "libLLVM70X86Utils",
+    "libLLVM70X86Disassembler",
 ]
 
 llvm_mips_static_libraries = [
-    "libLLVMMipsCodeGen",
-    "libLLVMMipsInfo",
-    "libLLVMMipsDesc",
-    "libLLVMMipsAsmParser",
-    "libLLVMMipsAsmPrinter",
-    "libLLVMMipsDisassembler",
+    "libLLVM70MipsCodeGen",
+    "libLLVM70MipsInfo",
+    "libLLVM70MipsDesc",
+    "libLLVM70MipsAsmParser",
+    "libLLVM70MipsAsmPrinter",
+    "libLLVM70MipsDisassembler",
 ]
 
 llvm_aarch64_static_libraries = [
-    "libLLVMAArch64CodeGen",
-    "libLLVMAArch64Info",
-    "libLLVMAArch64Desc",
-    "libLLVMAArch64AsmParser",
-    "libLLVMAArch64AsmPrinter",
-    "libLLVMAArch64Utils",
-    "libLLVMAArch64Disassembler",
+    "libLLVM70AArch64CodeGen",
+    "libLLVM70AArch64Info",
+    "libLLVM70AArch64Desc",
+    "libLLVM70AArch64AsmParser",
+    "libLLVM70AArch64AsmPrinter",
+    "libLLVM70AArch64Utils",
+    "libLLVM70AArch64Disassembler",
 ]
 
 llvm_amdgpu_static_libraries = [
-    "libLLVMAMDGPUCodeGen",
-    "libLLVMAMDGPUInfo",
-    "libLLVMAMDGPUDesc",
-    "libLLVMAMDGPUAsmParser",
-    "libLLVMAMDGPUAsmPrinter",
-    "libLLVMAMDGPUUtils",
+    "libLLVM70AMDGPUCodeGen",
+    "libLLVM70AMDGPUInfo",
+    "libLLVM70AMDGPUDesc",
+    "libLLVM70AMDGPUAsmParser",
+    "libLLVM70AMDGPUAsmPrinter",
+    "libLLVM70AMDGPUUtils",
 ]
 
 
 cc_library_shared {
     host_supported: true,
-    name: "libLLVM",
+    name: "libLLVM70",
     defaults: [
-        "llvm-defaults",
-        "force_build_llvm_components",
+        "llvm70-defaults",
+        "force_build_llvm70_components",
     ],
 
     whole_static_libs: [
         // pre static libraries
-        "libLLVMLinker",
-        "libLLVMipo",
-        "libLLVMDebugInfoDWARF",
-        "libLLVMDebugInfoMSF",
-        "libLLVMDebugInfoPDB",
-        "libLLVMSymbolize",
-        "libLLVMIRReader",
-        "libLLVMBitWriter",
-        "libLLVMBitReader",
-        "libLLVMPasses",
-        "libLLVMDemangle",
+        "libLLVM70Linker",
+        "libLLVM70ipo",
+        "libLLVM70DebugInfoDWARF",
+        "libLLVM70DebugInfoMSF",
+        "libLLVM70DebugInfoPDB",
+        "libLLVM70Symbolize",
+        "libLLVM70IRReader",
+        "libLLVM70BitWriter",
+        "libLLVM70BitReader",
+        "libLLVM70Passes",
+        "libLLVM70Demangle",
 
         // post static libraries
-        "libLLVMLTO",
-        "libLLVMAsmPrinter",
-        "libLLVMSelectionDAG",
-        "libLLVMCodeGen",
-        "libLLVMDebugInfoCodeView",
-        "libLLVMObject",
-        "libLLVMScalarOpts",
-        "libLLVMAggressiveInstCombine",
-        "libLLVMInstCombine",
-        "libLLVMInstrumentation",
-        "libLLVMTransformObjCARC",
-        "libLLVMTransformUtils",
-        "libLLVMAnalysis",
-        "libLLVMTarget",
-        "libLLVMGlobalISel",
-        "libLLVMMCDisassembler",
-        "libLLVMMC",
-        "libLLVMMCParser",
-        "libLLVMCore",
-        "libLLVMAsmParser",
-        "libLLVMOption",
-        "libLLVMSupport",
-        "libLLVMVectorize",
-        "libLLVMProfileData",
-        "libLLVMProfileDataCoverage",
-        "libLLVMLibDriver",
-        "libLLVMExecutionEngine",
-        "libLLVMRuntimeDyld",
-        "libLLVMMCJIT",
-        "libLLVMOrcJIT",
-        "libLLVMBinaryFormat",
+        "libLLVM70LTO",
+        "libLLVM70AsmPrinter",
+        "libLLVM70SelectionDAG",
+        "libLLVM70CodeGen",
+        "libLLVM70DebugInfoCodeView",
+        "libLLVM70Object",
+        "libLLVM70ScalarOpts",
+        "libLLVM70AggressiveInstCombine",
+        "libLLVM70InstCombine",
+        "libLLVM70Instrumentation",
+        "libLLVM70TransformObjCARC",
+        "libLLVM70TransformUtils",
+        "libLLVM70Analysis",
+        "libLLVM70Target",
+        "libLLVM70GlobalISel",
+        "libLLVM70MCDisassembler",
+        "libLLVM70MC",
+        "libLLVM70MCParser",
+        "libLLVM70Core",
+        "libLLVM70AsmParser",
+        "libLLVM70Option",
+        "libLLVM70Support",
+        "libLLVM70Vectorize",
+        "libLLVM70ProfileData",
+        "libLLVM70ProfileDataCoverage",
+        "libLLVM70LibDriver",
+        "libLLVM70ExecutionEngine",
+        "libLLVM70RuntimeDyld",
+        "libLLVM70MCJIT",
+        "libLLVM70OrcJIT",
+        "libLLVM70BinaryFormat",
     ],
 
     export_include_dirs: ["include"],

diff --git a/bindings/go/llvm/analysis.go b/bindings/go/llvm/analysis.go
index 3ae4b71..59b450a 100644 (file)
--- a/bindings/go/llvm/analysis.go
+++ b/bindings/go/llvm/analysis.go
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-package llvm
+package llvm70
 
 /*
 #include "llvm-c/Analysis.h" // If you are getting an error here read bindings/go/README.txt

diff --git a/bindings/go/llvm/bitreader.go b/bindings/go/llvm/bitreader.go
index c3bf07a..86ea7be 100644 (file)
--- a/bindings/go/llvm/bitreader.go
+++ b/bindings/go/llvm/bitreader.go
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-package llvm
+package llvm70
 
 /*
 #include "llvm-c/BitReader.h"

diff --git a/bindings/go/llvm/bitwriter.go b/bindings/go/llvm/bitwriter.go
index e03699c..4c65e8d 100644 (file)
--- a/bindings/go/llvm/bitwriter.go
+++ b/bindings/go/llvm/bitwriter.go
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-package llvm
+package llvm70
 
 /*
 #include "llvm-c/BitWriter.h"

diff --git a/bindings/go/llvm/dibuilder.go b/bindings/go/llvm/dibuilder.go
index 8ec8f3c..6dea778 100644 (file)
--- a/bindings/go/llvm/dibuilder.go
+++ b/bindings/go/llvm/dibuilder.go
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-package llvm
+package llvm70
 
 /*
 #include "IRBindings.h"

diff --git a/bindings/go/llvm/executionengine.go b/bindings/go/llvm/executionengine.go
index 91f8366..8e2a374 100644 (file)
--- a/bindings/go/llvm/executionengine.go
+++ b/bindings/go/llvm/executionengine.go
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-package llvm
+package llvm70
 
 /*
 #include "llvm-c/Core.h"

diff --git a/bindings/go/llvm/executionengine_test.go b/bindings/go/llvm/executionengine_test.go
index 3ca36d0..2737776 100644 (file)
--- a/bindings/go/llvm/executionengine_test.go
+++ b/bindings/go/llvm/executionengine_test.go
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-package llvm
+package llvm70
 
 import (
        "testing"

diff --git a/bindings/go/llvm/ir.go b/bindings/go/llvm/ir.go
index a336c0e..5498977 100644 (file)
--- a/bindings/go/llvm/ir.go
+++ b/bindings/go/llvm/ir.go
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-package llvm
+package llvm70
 
 /*
 #include "llvm-c/Core.h"

diff --git a/bindings/go/llvm/ir_test.go b/bindings/go/llvm/ir_test.go
index 10f4968..9840c30 100644 (file)
--- a/bindings/go/llvm/ir_test.go
+++ b/bindings/go/llvm/ir_test.go
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-package llvm
+package llvm70
 
 import (
        "strings"

diff --git a/bindings/go/llvm/linker.go b/bindings/go/llvm/linker.go
index ca16f76..0440144 100644 (file)
--- a/bindings/go/llvm/linker.go
+++ b/bindings/go/llvm/linker.go
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-package llvm
+package llvm70
 
 /*
 #include "llvm-c/Core.h"

diff --git a/bindings/go/llvm/llvm_dep.go b/bindings/go/llvm/llvm_dep.go
index 39b4675..e631373 100644 (file)
--- a/bindings/go/llvm/llvm_dep.go
+++ b/bindings/go/llvm/llvm_dep.go
@@ -14,6 +14,6 @@
 
 // +build !byollvm
 
-package llvm
+package llvm70
 
 var _ run_build_sh

diff --git a/bindings/go/llvm/string.go b/bindings/go/llvm/string.go
index bfe869d..ff39aa6 100644 (file)
--- a/bindings/go/llvm/string.go
+++ b/bindings/go/llvm/string.go
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-package llvm
+package llvm70
 
 import "fmt"
 

diff --git a/bindings/go/llvm/string_test.go b/bindings/go/llvm/string_test.go
index 3008f3e..d54a624 100644 (file)
--- a/bindings/go/llvm/string_test.go
+++ b/bindings/go/llvm/string_test.go
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-package llvm
+package llvm70
 
 import (
        "testing"

diff --git a/bindings/go/llvm/support.go b/bindings/go/llvm/support.go
index 6f20086..e4ea348 100644 (file)
--- a/bindings/go/llvm/support.go
+++ b/bindings/go/llvm/support.go
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-package llvm
+package llvm70
 
 /*
 #include "llvm-c/Support.h"

diff --git a/bindings/go/llvm/target.go b/bindings/go/llvm/target.go
index 268cc0e..4beb19d 100644 (file)
--- a/bindings/go/llvm/target.go
+++ b/bindings/go/llvm/target.go
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-package llvm
+package llvm70
 
 /*
 #include "llvm-c/Core.h"

diff --git a/bindings/go/llvm/transforms_instrumentation.go b/bindings/go/llvm/transforms_instrumentation.go
index 73e2732..c368430 100644 (file)
--- a/bindings/go/llvm/transforms_instrumentation.go
+++ b/bindings/go/llvm/transforms_instrumentation.go
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-package llvm
+package llvm70
 
 /*
 #include "InstrumentationBindings.h"

diff --git a/bindings/go/llvm/transforms_ipo.go b/bindings/go/llvm/transforms_ipo.go
index 12d972b..fe3f7a0 100644 (file)
--- a/bindings/go/llvm/transforms_ipo.go
+++ b/bindings/go/llvm/transforms_ipo.go
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-package llvm
+package llvm70
 
 /*
 #include "llvm-c/Transforms/IPO.h"

diff --git a/bindings/go/llvm/transforms_pmbuilder.go b/bindings/go/llvm/transforms_pmbuilder.go
index b164e58..4f804dc 100644 (file)
--- a/bindings/go/llvm/transforms_pmbuilder.go
+++ b/bindings/go/llvm/transforms_pmbuilder.go
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-package llvm
+package llvm70
 
 /*
 #include "llvm-c/Transforms/PassManagerBuilder.h"

diff --git a/bindings/go/llvm/transforms_scalar.go b/bindings/go/llvm/transforms_scalar.go
index cb46f68..2232138 100644 (file)
--- a/bindings/go/llvm/transforms_scalar.go
+++ b/bindings/go/llvm/transforms_scalar.go
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-package llvm
+package llvm70
 
 /*
 #include "llvm-c/Transforms/Scalar.h"

diff --git a/bindings/go/llvm/version.go b/bindings/go/llvm/version.go
index d0623be..949e7ea 100644 (file)
--- a/bindings/go/llvm/version.go
+++ b/bindings/go/llvm/version.go
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-package llvm
+package llvm70
 
 /*
 #include "llvm/Config/llvm-config.h"

diff --git a/lib/Analysis/Android.bp b/lib/Analysis/Android.bp
index ffccb5a..707b0f8 100644 (file)
--- a/lib/Analysis/Android.bp
+++ b/lib/Analysis/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMAnalysis",
+    name: "libLLVM70Analysis",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm70-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/Android.bp b/lib/Android.bp
index 127ba59..8585a24 100644 (file)
--- a/lib/Android.bp
+++ b/lib/Android.bp
@@ -1,8 +1,8 @@
 cc_defaults {
-    name: "llvm-lib-defaults",
+    name: "llvm70-lib-defaults",
     vendor_available: true,
-    defaults: ["llvm-defaults"],
-    export_header_lib_headers: ["llvm-headers"],
+    defaults: ["llvm70-defaults"],
+    export_header_lib_headers: ["llvm70-headers"],
     target: {
         windows: {
             enabled: true,

diff --git a/lib/AsmParser/Android.bp b/lib/AsmParser/Android.bp
index 3fff6b2..356fb8e 100644 (file)
--- a/lib/AsmParser/Android.bp
+++ b/lib/AsmParser/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMAsmParser",
+    name: "libLLVM70AsmParser",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm70-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/BinaryFormat/Android.bp b/lib/BinaryFormat/Android.bp
index b99bb0a..04c96ff 100644 (file)
--- a/lib/BinaryFormat/Android.bp
+++ b/lib/BinaryFormat/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMBinaryFormat",
+    name: "libLLVM70BinaryFormat",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm70-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/Bitcode/Reader/Android.bp b/lib/Bitcode/Reader/Android.bp
index da7c543..f4d76c6 100644 (file)
--- a/lib/Bitcode/Reader/Android.bp
+++ b/lib/Bitcode/Reader/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMBitReader",
+    name: "libLLVM70BitReader",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm70-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/Bitcode/Writer/Android.bp b/lib/Bitcode/Writer/Android.bp
index 754a252..cd743d2 100644 (file)
--- a/lib/Bitcode/Writer/Android.bp
+++ b/lib/Bitcode/Writer/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMBitWriter",
+    name: "libLLVM70BitWriter",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm70-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/CodeGen/Android.bp b/lib/CodeGen/Android.bp
index bcd447f..8472de3 100644 (file)
--- a/lib/CodeGen/Android.bp
+++ b/lib/CodeGen/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMCodeGen",
+    name: "libLLVM70CodeGen",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm70-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/CodeGen/AsmPrinter/Android.bp b/lib/CodeGen/AsmPrinter/Android.bp
index d94c00c..4efa7a2 100644 (file)
--- a/lib/CodeGen/AsmPrinter/Android.bp
+++ b/lib/CodeGen/AsmPrinter/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMAsmPrinter",
+    name: "libLLVM70AsmPrinter",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm70-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/CodeGen/GlobalISel/Android.bp b/lib/CodeGen/GlobalISel/Android.bp
index 4dd07c6..d9b2666 100644 (file)
--- a/lib/CodeGen/GlobalISel/Android.bp
+++ b/lib/CodeGen/GlobalISel/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMGlobalISel",
+    name: "libLLVM70GlobalISel",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm70-lib-defaults",
     ],
     // Aarch64 and AMDGPU targets require GlobalIsel
     // Experimental feature enabled by building all srcs

diff --git a/lib/CodeGen/MIRParser/Android.bp b/lib/CodeGen/MIRParser/Android.bp
index 4c68ec6..171e352 100644 (file)
--- a/lib/CodeGen/MIRParser/Android.bp
+++ b/lib/CodeGen/MIRParser/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMMIRParser",
+    name: "libLLVM70MIRParser",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm70-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/CodeGen/SelectionDAG/Android.bp b/lib/CodeGen/SelectionDAG/Android.bp
index 79c705a..c19ff0d 100644 (file)
--- a/lib/CodeGen/SelectionDAG/Android.bp
+++ b/lib/CodeGen/SelectionDAG/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMSelectionDAG",
+    name: "libLLVM70SelectionDAG",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm70-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/DebugInfo/CodeView/Android.bp b/lib/DebugInfo/CodeView/Android.bp
index 6abfae1..4ed3de1 100644 (file)
--- a/lib/DebugInfo/CodeView/Android.bp
+++ b/lib/DebugInfo/CodeView/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMDebugInfoCodeView",
+    name: "libLLVM70DebugInfoCodeView",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm70-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/DebugInfo/DWARF/Android.bp b/lib/DebugInfo/DWARF/Android.bp
index c198e1f..c922c62 100644 (file)
--- a/lib/DebugInfo/DWARF/Android.bp
+++ b/lib/DebugInfo/DWARF/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMDebugInfoDWARF",
+    name: "libLLVM70DebugInfoDWARF",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm70-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/DebugInfo/MSF/Android.bp b/lib/DebugInfo/MSF/Android.bp
index 9b096bd..d89ae46 100644 (file)
--- a/lib/DebugInfo/MSF/Android.bp
+++ b/lib/DebugInfo/MSF/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMDebugInfoMSF",
+    name: "libLLVM70DebugInfoMSF",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm70-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/DebugInfo/PDB/Android.bp b/lib/DebugInfo/PDB/Android.bp
index 2ef641f..4cc84e7 100644 (file)
--- a/lib/DebugInfo/PDB/Android.bp
+++ b/lib/DebugInfo/PDB/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMDebugInfoPDB",
+    name: "libLLVM70DebugInfoPDB",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm70-lib-defaults",
     ],
     srcs: [
         "*.cpp",

diff --git a/lib/DebugInfo/Symbolize/Android.bp b/lib/DebugInfo/Symbolize/Android.bp
index c859f58..09d72c1 100644 (file)
--- a/lib/DebugInfo/Symbolize/Android.bp
+++ b/lib/DebugInfo/Symbolize/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMSymbolize",
+    name: "libLLVM70Symbolize",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm70-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/Demangle/Android.bp b/lib/Demangle/Android.bp
index 476e718..ccd2b4d 100644 (file)
--- a/lib/Demangle/Android.bp
+++ b/lib/Demangle/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMDemangle",
+    name: "libLLVM70Demangle",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm70-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/ExecutionEngine/Android.bp b/lib/ExecutionEngine/Android.bp
index 41a4492..6a3cb5e 100644 (file)
--- a/lib/ExecutionEngine/Android.bp
+++ b/lib/ExecutionEngine/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMExecutionEngine",
+    name: "libLLVM70ExecutionEngine",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm70-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/ExecutionEngine/Interpreter/Android.bp b/lib/ExecutionEngine/Interpreter/Android.bp
index 190a9a8..68137b7 100644 (file)
--- a/lib/ExecutionEngine/Interpreter/Android.bp
+++ b/lib/ExecutionEngine/Interpreter/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMInterpreter",
+    name: "libLLVM70Interpreter",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm70-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/ExecutionEngine/MCJIT/Android.bp b/lib/ExecutionEngine/MCJIT/Android.bp
index 6b43bb1..508395f 100644 (file)
--- a/lib/ExecutionEngine/MCJIT/Android.bp
+++ b/lib/ExecutionEngine/MCJIT/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMMCJIT",
+    name: "libLLVM70MCJIT",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm70-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/ExecutionEngine/Orc/Android.bp b/lib/ExecutionEngine/Orc/Android.bp
index 1bb2fae..126c472 100644 (file)
--- a/lib/ExecutionEngine/Orc/Android.bp
+++ b/lib/ExecutionEngine/Orc/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMOrcJIT",
+    name: "libLLVM70OrcJIT",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm70-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/ExecutionEngine/RuntimeDyld/Android.bp b/lib/ExecutionEngine/RuntimeDyld/Android.bp
index 408077f..263742e 100644 (file)
--- a/lib/ExecutionEngine/RuntimeDyld/Android.bp
+++ b/lib/ExecutionEngine/RuntimeDyld/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMRuntimeDyld",
+    name: "libLLVM70RuntimeDyld",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm70-lib-defaults",
     ],
     srcs: [
         "*.cpp",

diff --git a/lib/IR/Android.bp b/lib/IR/Android.bp
index 9bac320..a0a122b 100644 (file)
--- a/lib/IR/Android.bp
+++ b/lib/IR/Android.bp
@@ -1,14 +1,14 @@
 cc_library_static {
-    name: "libLLVMCore",
+    name: "libLLVM70Core",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm70-lib-defaults",
     ],
-    generated_headers: ["llvm-gen-core"],
+    generated_headers: ["llvm70-gen-core"],
     srcs: ["*.cpp"],
 }
 
-llvm_tblgen {
-    name: "llvm-gen-core",
+llvm70_tblgen {
+    name: "llvm70-gen-core",
     in: "AttributesCompatFunc.td",
     outs: ["AttributesCompatFunc.inc"],
 }

diff --git a/lib/IRReader/Android.bp b/lib/IRReader/Android.bp
index a01a80f..8394312 100644 (file)
--- a/lib/IRReader/Android.bp
+++ b/lib/IRReader/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMIRReader",
+    name: "libLLVM70IRReader",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm70-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/LTO/Android.bp b/lib/LTO/Android.bp
index 928bd5c..0c54e81 100644 (file)
--- a/lib/LTO/Android.bp
+++ b/lib/LTO/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMLTO",
+    name: "libLLVM70LTO",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm70-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/Linker/Android.bp b/lib/Linker/Android.bp
index a5e1a95..09d0ac6 100644 (file)
--- a/lib/Linker/Android.bp
+++ b/lib/Linker/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMLinker",
+    name: "libLLVM70Linker",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm70-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/MC/Android.bp b/lib/MC/Android.bp
index 05e8445..3b06698 100644 (file)
--- a/lib/MC/Android.bp
+++ b/lib/MC/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMMC",
+    name: "libLLVM70MC",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm70-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/MC/MCDisassembler/Android.bp b/lib/MC/MCDisassembler/Android.bp
index c2f25fa..54af38d 100644 (file)
--- a/lib/MC/MCDisassembler/Android.bp
+++ b/lib/MC/MCDisassembler/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMMCDisassembler",
+    name: "libLLVM70MCDisassembler",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm70-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/MC/MCParser/Android.bp b/lib/MC/MCParser/Android.bp
index cc7cd1f..034e877 100644 (file)
--- a/lib/MC/MCParser/Android.bp
+++ b/lib/MC/MCParser/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMMCParser",
+    name: "libLLVM70MCParser",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm70-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/Object/Android.bp b/lib/Object/Android.bp
index c389476..8b6f666 100644 (file)
--- a/lib/Object/Android.bp
+++ b/lib/Object/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMObject",
+    name: "libLLVM70Object",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm70-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/ObjectYAML/Android.bp b/lib/ObjectYAML/Android.bp
index 17f4a67..c2173a0 100644 (file)
--- a/lib/ObjectYAML/Android.bp
+++ b/lib/ObjectYAML/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMObjectYAML",
+    name: "libLLVM70ObjectYAML",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm70-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/Option/Android.bp b/lib/Option/Android.bp
index 035db4d..3a21090 100644 (file)
--- a/lib/Option/Android.bp
+++ b/lib/Option/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMOption",
+    name: "libLLVM70Option",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm70-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/Passes/Android.bp b/lib/Passes/Android.bp
index f98e1b6..6e166bc 100644 (file)
--- a/lib/Passes/Android.bp
+++ b/lib/Passes/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMPasses",
+    name: "libLLVM70Passes",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm70-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/ProfileData/Android.bp b/lib/ProfileData/Android.bp
index 710d5d4..e9e39b3 100644 (file)
--- a/lib/ProfileData/Android.bp
+++ b/lib/ProfileData/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMProfileData",
+    name: "libLLVM70ProfileData",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm70-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/ProfileData/Coverage/Android.bp b/lib/ProfileData/Coverage/Android.bp
index 347c500..495442c 100644 (file)
--- a/lib/ProfileData/Coverage/Android.bp
+++ b/lib/ProfileData/Coverage/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMProfileDataCoverage",
+    name: "libLLVM70ProfileDataCoverage",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm70-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/Support/Android.bp b/lib/Support/Android.bp
index d00de3f..f97c818 100644 (file)
--- a/lib/Support/Android.bp
+++ b/lib/Support/Android.bp
@@ -1,10 +1,10 @@
 cc_library_static {
-    name: "libLLVMSupport",
+    name: "libLLVM70Support",
     vendor_available: true,
-    defaults: ["llvm-defaults-no-generated-headers"],
+    defaults: ["llvm70-defaults-no-generated-headers"],
     target: {
-        // llvm-defaults turns off host builds by default, turn it back on for
-        // modules that are used to build llvm-tblgen
+        // llvm70-defaults turns off host builds by default, turn it back on for
+        // modules that are used to build llvm70-tblgen
         host: {
             enabled: true,
         },

diff --git a/lib/TableGen/Android.bp b/lib/TableGen/Android.bp
index c331017..720c621 100644 (file)
--- a/lib/TableGen/Android.bp
+++ b/lib/TableGen/Android.bp
@@ -1,10 +1,10 @@
 cc_library_static {
-    name: "libLLVMTableGen",
-    defaults: ["llvm-defaults-no-generated-headers"],
+    name: "libLLVM70TableGen",
+    defaults: ["llvm70-defaults-no-generated-headers"],
     srcs: ["*.cpp"],
     target: {
-        // llvm-defaults turns off host builds by default, turn it back on for
-        // modules that are used to build llvm-tblgen
+        // llvm70-defaults turns off host builds by default, turn it back on for
+        // modules that are used to build llvm70-tblgen
         host: {
             enabled: true,
         },

diff --git a/lib/Target/AArch64/Android.bp b/lib/Target/AArch64/Android.bp
index 125558f..71a8548 100644 (file)
--- a/lib/Target/AArch64/Android.bp
+++ b/lib/Target/AArch64/Android.bp
@@ -1,20 +1,20 @@
 cc_library_static {
-    name: "libLLVMAArch64CodeGen",
+    name: "libLLVM70AArch64CodeGen",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-aarch64-defaults",
+        "llvm70-lib-defaults",
+        "llvm70-aarch64-defaults",
     ],
     srcs: ["*.cpp"],
 }
 
 cc_defaults {
-    name: "llvm-aarch64-defaults",
-    generated_headers: ["llvm-gen-aarch64"],
-    static_libs: ["llvm-aarch64-headers"],
+    name: "llvm70-aarch64-defaults",
+    generated_headers: ["llvm70-gen-aarch64"],
+    static_libs: ["llvm70-aarch64-headers"],
 }
 
 cc_library_static {
-    name: "llvm-aarch64-headers",
+    name: "llvm70-aarch64-headers",
     vendor_available: true,
     host_supported: true,
     target: {
@@ -25,8 +25,8 @@ cc_library_static {
     export_include_dirs: ["."],
 }
 
-llvm_tblgen {
-    name: "llvm-gen-aarch64",
+llvm70_tblgen {
+    name: "llvm70-gen-aarch64",
     in: "AArch64.td",
     outs: [
         "AArch64GenRegisterInfo.inc",

diff --git a/lib/Target/AArch64/AsmParser/Android.bp b/lib/Target/AArch64/AsmParser/Android.bp
index 9b409ae..911c56e 100644 (file)
--- a/lib/Target/AArch64/AsmParser/Android.bp
+++ b/lib/Target/AArch64/AsmParser/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMAArch64AsmParser",
+    name: "libLLVM70AArch64AsmParser",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-aarch64-defaults",
+        "llvm70-lib-defaults",
+        "llvm70-aarch64-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/Target/AArch64/Disassembler/Android.bp b/lib/Target/AArch64/Disassembler/Android.bp
index e7a04d3..98d5184 100644 (file)
--- a/lib/Target/AArch64/Disassembler/Android.bp
+++ b/lib/Target/AArch64/Disassembler/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMAArch64Disassembler",
+    name: "libLLVM70AArch64Disassembler",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-aarch64-defaults",
+        "llvm70-lib-defaults",
+        "llvm70-aarch64-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/Target/AArch64/InstPrinter/Android.bp b/lib/Target/AArch64/InstPrinter/Android.bp
index f1dac2a..4b1c916 100644 (file)
--- a/lib/Target/AArch64/InstPrinter/Android.bp
+++ b/lib/Target/AArch64/InstPrinter/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMAArch64AsmPrinter",
+    name: "libLLVM70AArch64AsmPrinter",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-aarch64-defaults",
+        "llvm70-lib-defaults",
+        "llvm70-aarch64-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/Target/AArch64/MCTargetDesc/Android.bp b/lib/Target/AArch64/MCTargetDesc/Android.bp
index 9edc154..f9f6663 100644 (file)
--- a/lib/Target/AArch64/MCTargetDesc/Android.bp
+++ b/lib/Target/AArch64/MCTargetDesc/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMAArch64Desc",
+    name: "libLLVM70AArch64Desc",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-aarch64-defaults",
+        "llvm70-lib-defaults",
+        "llvm70-aarch64-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/Target/AArch64/TargetInfo/Android.bp b/lib/Target/AArch64/TargetInfo/Android.bp
index baa98ca..33032bb 100644 (file)
--- a/lib/Target/AArch64/TargetInfo/Android.bp
+++ b/lib/Target/AArch64/TargetInfo/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMAArch64Info",
+    name: "libLLVM70AArch64Info",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-aarch64-defaults",
+        "llvm70-lib-defaults",
+        "llvm70-aarch64-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/Target/AArch64/Utils/Android.bp b/lib/Target/AArch64/Utils/Android.bp
index aa2db82..0fbc383 100644 (file)
--- a/lib/Target/AArch64/Utils/Android.bp
+++ b/lib/Target/AArch64/Utils/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMAArch64Utils",
+    name: "libLLVM70AArch64Utils",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-aarch64-defaults",
+        "llvm70-lib-defaults",
+        "llvm70-aarch64-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/Target/AMDGPU/Android.bp b/lib/Target/AMDGPU/Android.bp
index 0a88ad1..81c897f 100644 (file)
--- a/lib/Target/AMDGPU/Android.bp
+++ b/lib/Target/AMDGPU/Android.bp
@@ -1,20 +1,20 @@
 cc_library_static {
-    name: "libLLVMAMDGPUCodeGen",
+    name: "libLLVM70AMDGPUCodeGen",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-amdgpu-defaults",
+        "llvm70-lib-defaults",
+        "llvm70-amdgpu-defaults",
     ],
     srcs: ["*.cpp"],
 }
 
 cc_defaults {
-    name: "llvm-amdgpu-defaults",
-    generated_headers: ["llvm-gen-amdgpu", "llvm-gen-r600"],
-    static_libs: ["llvm-amdgpu-headers"],
+    name: "llvm70-amdgpu-defaults",
+    generated_headers: ["llvm70-gen-amdgpu", "llvm70-gen-r600"],
+    static_libs: ["llvm70-amdgpu-headers"],
 }
 
 cc_library_static {
-    name: "llvm-amdgpu-headers",
+    name: "llvm70-amdgpu-headers",
     host_supported: true,
     target: {
         windows: {
@@ -24,8 +24,8 @@ cc_library_static {
     export_include_dirs: ["."],
 }
 
-llvm_tblgen {
-    name: "llvm-gen-amdgpu",
+llvm70_tblgen {
+    name: "llvm70-gen-amdgpu",
     in: "AMDGPU.td",
     outs: [
         "AMDGPUGenRegisterInfo.inc",
@@ -45,8 +45,8 @@ llvm_tblgen {
     ],
 }
 
-llvm_tblgen {
-    name: "llvm-gen-r600",
+llvm70_tblgen {
+    name: "llvm70-gen-r600",
     in: "R600.td",
     outs: [
         "R600GenAsmWriter.inc",

diff --git a/lib/Target/AMDGPU/AsmParser/Android.bp b/lib/Target/AMDGPU/AsmParser/Android.bp
index 9e6fd08..da29ea6 100644 (file)
--- a/lib/Target/AMDGPU/AsmParser/Android.bp
+++ b/lib/Target/AMDGPU/AsmParser/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMAMDGPUAsmParser",
+    name: "libLLVM70AMDGPUAsmParser",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-amdgpu-defaults",
+        "llvm70-lib-defaults",
+        "llvm70-amdgpu-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/Target/AMDGPU/InstPrinter/Android.bp b/lib/Target/AMDGPU/InstPrinter/Android.bp
index 0ee4ec3..860c551 100644 (file)
--- a/lib/Target/AMDGPU/InstPrinter/Android.bp
+++ b/lib/Target/AMDGPU/InstPrinter/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMAMDGPUAsmPrinter",
+    name: "libLLVM70AMDGPUAsmPrinter",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-amdgpu-defaults",
+        "llvm70-lib-defaults",
+        "llvm70-amdgpu-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/Target/AMDGPU/MCTargetDesc/Android.bp b/lib/Target/AMDGPU/MCTargetDesc/Android.bp
index 93a6ea5..73aee6a 100644 (file)
--- a/lib/Target/AMDGPU/MCTargetDesc/Android.bp
+++ b/lib/Target/AMDGPU/MCTargetDesc/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMAMDGPUDesc",
+    name: "libLLVM70AMDGPUDesc",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-amdgpu-defaults",
+        "llvm70-lib-defaults",
+        "llvm70-amdgpu-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/Target/AMDGPU/TargetInfo/Android.bp b/lib/Target/AMDGPU/TargetInfo/Android.bp
index db94c04..4bc6f44 100644 (file)
--- a/lib/Target/AMDGPU/TargetInfo/Android.bp
+++ b/lib/Target/AMDGPU/TargetInfo/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMAMDGPUInfo",
+    name: "libLLVM70AMDGPUInfo",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-amdgpu-defaults",
+        "llvm70-lib-defaults",
+        "llvm70-amdgpu-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/Target/AMDGPU/Utils/Android.bp b/lib/Target/AMDGPU/Utils/Android.bp
index f6fb594..70cb105 100644 (file)
--- a/lib/Target/AMDGPU/Utils/Android.bp
+++ b/lib/Target/AMDGPU/Utils/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMAMDGPUUtils",
+    name: "libLLVM70AMDGPUUtils",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-amdgpu-defaults",
+        "llvm70-lib-defaults",
+        "llvm70-amdgpu-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/Target/ARM/Android.bp b/lib/Target/ARM/Android.bp
index 57a81bd..3fef74f 100644 (file)
--- a/lib/Target/ARM/Android.bp
+++ b/lib/Target/ARM/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMARMCodeGen",
+    name: "libLLVM70ARMCodeGen",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-arm-defaults",
+        "llvm70-lib-defaults",
+        "llvm70-arm-defaults",
     ],
     srcs: ["*.cpp"],
 
@@ -14,13 +14,13 @@ cc_library_static {
 }
 
 cc_defaults {
-    name: "llvm-arm-defaults",
-    generated_headers: ["llvm-gen-arm"],
-    static_libs: ["llvm-arm-headers"],
+    name: "llvm70-arm-defaults",
+    generated_headers: ["llvm70-gen-arm"],
+    static_libs: ["llvm70-arm-headers"],
 }
 
 cc_library_static {
-    name: "llvm-arm-headers",
+    name: "llvm70-arm-headers",
     vendor_available: true,
     host_supported: true,
     target: {
@@ -31,8 +31,8 @@ cc_library_static {
     export_include_dirs: ["."],
 }
 
-llvm_tblgen {
-    name: "llvm-gen-arm",
+llvm70_tblgen {
+    name: "llvm70-gen-arm",
     in: "ARM.td",
     outs: [
         "ARMGenRegisterInfo.inc",

diff --git a/lib/Target/ARM/AsmParser/Android.bp b/lib/Target/ARM/AsmParser/Android.bp
index 3340db5..e4eca88 100644 (file)
--- a/lib/Target/ARM/AsmParser/Android.bp
+++ b/lib/Target/ARM/AsmParser/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMARMAsmParser",
+    name: "libLLVM70ARMAsmParser",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-arm-defaults",
+        "llvm70-lib-defaults",
+        "llvm70-arm-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/Target/ARM/Disassembler/Android.bp b/lib/Target/ARM/Disassembler/Android.bp
index 8deda86..9f9f74d 100644 (file)
--- a/lib/Target/ARM/Disassembler/Android.bp
+++ b/lib/Target/ARM/Disassembler/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMARMDisassembler",
+    name: "libLLVM70ARMDisassembler",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-arm-defaults",
+        "llvm70-lib-defaults",
+        "llvm70-arm-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/Target/ARM/InstPrinter/Android.bp b/lib/Target/ARM/InstPrinter/Android.bp
index f54529f..f528d57 100644 (file)
--- a/lib/Target/ARM/InstPrinter/Android.bp
+++ b/lib/Target/ARM/InstPrinter/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMARMAsmPrinter",
+    name: "libLLVM70ARMAsmPrinter",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-arm-defaults",
+        "llvm70-lib-defaults",
+        "llvm70-arm-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/Target/ARM/MCTargetDesc/Android.bp b/lib/Target/ARM/MCTargetDesc/Android.bp
index de05686..de3f850 100644 (file)
--- a/lib/Target/ARM/MCTargetDesc/Android.bp
+++ b/lib/Target/ARM/MCTargetDesc/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMARMDesc",
+    name: "libLLVM70ARMDesc",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-arm-defaults",
+        "llvm70-lib-defaults",
+        "llvm70-arm-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/Target/ARM/TargetInfo/Android.bp b/lib/Target/ARM/TargetInfo/Android.bp
index cfead24..d6bdf9f 100644 (file)
--- a/lib/Target/ARM/TargetInfo/Android.bp
+++ b/lib/Target/ARM/TargetInfo/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMARMInfo",
+    name: "libLLVM70ARMInfo",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-arm-defaults",
+        "llvm70-lib-defaults",
+        "llvm70-arm-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/Target/ARM/Utils/Android.bp b/lib/Target/ARM/Utils/Android.bp
index bd2ae34..f7b2239 100644 (file)
--- a/lib/Target/ARM/Utils/Android.bp
+++ b/lib/Target/ARM/Utils/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMARMUtils",
+    name: "libLLVM70ARMUtils",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-arm-defaults",
+        "llvm70-lib-defaults",
+        "llvm70-arm-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/Target/Android.bp b/lib/Target/Android.bp
index 5101e66..3dd4877 100644 (file)
--- a/lib/Target/Android.bp
+++ b/lib/Target/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMTarget",
+    name: "libLLVM70Target",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm70-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/Target/Mips/Android.bp b/lib/Target/Mips/Android.bp
index 8e1a99d..3a2d5ba 100644 (file)
--- a/lib/Target/Mips/Android.bp
+++ b/lib/Target/Mips/Android.bp
@@ -1,20 +1,20 @@
 cc_library_static {
-    name: "libLLVMMipsCodeGen",
+    name: "libLLVM70MipsCodeGen",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-mips-defaults",
+        "llvm70-lib-defaults",
+        "llvm70-mips-defaults",
     ],
     srcs: ["*.cpp"],
 }
 
 cc_defaults {
-    name: "llvm-mips-defaults",
-    generated_headers: ["llvm-gen-mips"],
-    static_libs: ["llvm-mips-headers"],
+    name: "llvm70-mips-defaults",
+    generated_headers: ["llvm70-gen-mips"],
+    static_libs: ["llvm70-mips-headers"],
 }
 
 cc_library_static {
-    name: "llvm-mips-headers",
+    name: "llvm70-mips-headers",
     vendor_available: true,
     host_supported: true,
     target: {
@@ -25,8 +25,8 @@ cc_library_static {
     export_include_dirs: ["."],
 }
 
-llvm_tblgen {
-    name: "llvm-gen-mips",
+llvm70_tblgen {
+    name: "llvm70-gen-mips",
     in: "Mips.td",
     outs: [
         "MipsGenRegisterInfo.inc",

diff --git a/lib/Target/Mips/AsmParser/Android.bp b/lib/Target/Mips/AsmParser/Android.bp
index b61dd02..b526c9f 100644 (file)
--- a/lib/Target/Mips/AsmParser/Android.bp
+++ b/lib/Target/Mips/AsmParser/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMMipsAsmParser",
+    name: "libLLVM70MipsAsmParser",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-mips-defaults",
+        "llvm70-lib-defaults",
+        "llvm70-mips-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/Target/Mips/Disassembler/Android.bp b/lib/Target/Mips/Disassembler/Android.bp
index 66118be..0d3848d 100644 (file)
--- a/lib/Target/Mips/Disassembler/Android.bp
+++ b/lib/Target/Mips/Disassembler/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMMipsDisassembler",
+    name: "libLLVM70MipsDisassembler",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-mips-defaults",
+        "llvm70-lib-defaults",
+        "llvm70-mips-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/Target/Mips/InstPrinter/Android.bp b/lib/Target/Mips/InstPrinter/Android.bp
index 28483b6..c482c98 100644 (file)
--- a/lib/Target/Mips/InstPrinter/Android.bp
+++ b/lib/Target/Mips/InstPrinter/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMMipsAsmPrinter",
+    name: "libLLVM70MipsAsmPrinter",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-mips-defaults",
+        "llvm70-lib-defaults",
+        "llvm70-mips-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/Target/Mips/MCTargetDesc/Android.bp b/lib/Target/Mips/MCTargetDesc/Android.bp
index cc06b28..5c5f43c 100644 (file)
--- a/lib/Target/Mips/MCTargetDesc/Android.bp
+++ b/lib/Target/Mips/MCTargetDesc/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMMipsDesc",
+    name: "libLLVM70MipsDesc",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-mips-defaults",
+        "llvm70-lib-defaults",
+        "llvm70-mips-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/Target/Mips/TargetInfo/Android.bp b/lib/Target/Mips/TargetInfo/Android.bp
index 938c076..a079283 100644 (file)
--- a/lib/Target/Mips/TargetInfo/Android.bp
+++ b/lib/Target/Mips/TargetInfo/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMMipsInfo",
+    name: "libLLVM70MipsInfo",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-mips-defaults",
+        "llvm70-lib-defaults",
+        "llvm70-mips-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/Target/X86/Android.bp b/lib/Target/X86/Android.bp
index 6ee0a69..d61fa28 100644 (file)
--- a/lib/Target/X86/Android.bp
+++ b/lib/Target/X86/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMX86CodeGen",
+    name: "libLLVM70X86CodeGen",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-x86-defaults",
+        "llvm70-lib-defaults",
+        "llvm70-x86-defaults",
     ],
     srcs: ["*.cpp"],
 
@@ -15,13 +15,13 @@ cc_library_static {
 }
 
 cc_defaults {
-    name: "llvm-x86-defaults",
-    generated_headers: ["llvm-gen-x86"],
-    static_libs: ["llvm-x86-headers"],
+    name: "llvm70-x86-defaults",
+    generated_headers: ["llvm70-gen-x86"],
+    static_libs: ["llvm70-x86-headers"],
 }
 
 cc_library_static {
-    name: "llvm-x86-headers",
+    name: "llvm70-x86-headers",
     vendor_available: true,
     host_supported: true,
     target: {
@@ -32,8 +32,8 @@ cc_library_static {
     export_include_dirs: ["."],
 }
 
-llvm_tblgen {
-    name: "llvm-gen-x86",
+llvm70_tblgen {
+    name: "llvm70-gen-x86",
     in: "X86.td",
     outs: [
         "X86GenAsmMatcher.inc",

diff --git a/lib/Target/X86/AsmParser/Android.bp b/lib/Target/X86/AsmParser/Android.bp
index 830e02b..1c7430f 100644 (file)
--- a/lib/Target/X86/AsmParser/Android.bp
+++ b/lib/Target/X86/AsmParser/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMX86AsmParser",
+    name: "libLLVM70X86AsmParser",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-x86-defaults",
+        "llvm70-lib-defaults",
+        "llvm70-x86-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/Target/X86/Disassembler/Android.bp b/lib/Target/X86/Disassembler/Android.bp
index 0ee2e5e..668d437 100644 (file)
--- a/lib/Target/X86/Disassembler/Android.bp
+++ b/lib/Target/X86/Disassembler/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMX86Disassembler",
+    name: "libLLVM70X86Disassembler",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-x86-defaults",
+        "llvm70-lib-defaults",
+        "llvm70-x86-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/Target/X86/InstPrinter/Android.bp b/lib/Target/X86/InstPrinter/Android.bp
index bd37b9e..9dc7a5d 100644 (file)
--- a/lib/Target/X86/InstPrinter/Android.bp
+++ b/lib/Target/X86/InstPrinter/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMX86AsmPrinter",
+    name: "libLLVM70X86AsmPrinter",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-x86-defaults",
+        "llvm70-lib-defaults",
+        "llvm70-x86-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/Target/X86/MCTargetDesc/Android.bp b/lib/Target/X86/MCTargetDesc/Android.bp
index 7eb5a6e..17926c9 100644 (file)
--- a/lib/Target/X86/MCTargetDesc/Android.bp
+++ b/lib/Target/X86/MCTargetDesc/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMX86Desc",
+    name: "libLLVM70X86Desc",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-x86-defaults",
+        "llvm70-lib-defaults",
+        "llvm70-x86-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/Target/X86/TargetInfo/Android.bp b/lib/Target/X86/TargetInfo/Android.bp
index a1a2f5c..fd911fe 100644 (file)
--- a/lib/Target/X86/TargetInfo/Android.bp
+++ b/lib/Target/X86/TargetInfo/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMX86Info",
+    name: "libLLVM70X86Info",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-x86-defaults",
+        "llvm70-lib-defaults",
+        "llvm70-x86-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/Target/X86/Utils/Android.bp b/lib/Target/X86/Utils/Android.bp
index 30d8ec1..5c1f932 100644 (file)
--- a/lib/Target/X86/Utils/Android.bp
+++ b/lib/Target/X86/Utils/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMX86Utils",
+    name: "libLLVM70X86Utils",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-x86-defaults",
+        "llvm70-lib-defaults",
+        "llvm70-x86-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/ToolDrivers/llvm-lib/Android.bp b/lib/ToolDrivers/llvm-lib/Android.bp
index d33020b..d3722af 100644 (file)
--- a/lib/ToolDrivers/llvm-lib/Android.bp
+++ b/lib/ToolDrivers/llvm-lib/Android.bp
@@ -1,14 +1,14 @@
 cc_library_static {
-    name: "libLLVMLibDriver",
+    name: "libLLVM70LibDriver",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm70-lib-defaults",
     ],
-    generated_headers: ["llvm-gen-libdriver"],
+    generated_headers: ["llvm70-gen-libdriver"],
     srcs: ["*.cpp"],
 }
 
-llvm_tblgen {
-    name: "llvm-gen-libdriver",
+llvm70_tblgen {
+    name: "llvm70-gen-libdriver",
     in: "Options.td",
     outs: ["Options.inc"],
 }

diff --git a/lib/Transforms/AggressiveInstCombine/Android.bp b/lib/Transforms/AggressiveInstCombine/Android.bp
index b2c12fc..a74ee1f 100644 (file)
--- a/lib/Transforms/AggressiveInstCombine/Android.bp
+++ b/lib/Transforms/AggressiveInstCombine/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMAggressiveInstCombine",
+    name: "libLLVM70AggressiveInstCombine",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm70-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/Transforms/Hello/Android.bp b/lib/Transforms/Hello/Android.bp
index 64e2e6d..2b546ef 100644 (file)
--- a/lib/Transforms/Hello/Android.bp
+++ b/lib/Transforms/Hello/Android.bp
@@ -1,7 +1,7 @@
 cc_library_host_shared {
-    name: "LLVMHello",
+    name: "LLVM70Hello",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm70-lib-defaults",
     ],
     srcs: ["*.cpp"],
     allow_undefined_symbols: true,

diff --git a/lib/Transforms/IPO/Android.bp b/lib/Transforms/IPO/Android.bp
index 644cee1..4f4b146 100644 (file)
--- a/lib/Transforms/IPO/Android.bp
+++ b/lib/Transforms/IPO/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMipo",
+    name: "libLLVM70ipo",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm70-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/Transforms/InstCombine/Android.bp b/lib/Transforms/InstCombine/Android.bp
index 1d64cca..35de50a 100644 (file)
--- a/lib/Transforms/InstCombine/Android.bp
+++ b/lib/Transforms/InstCombine/Android.bp
@@ -1,14 +1,14 @@
 cc_library_static {
-    name: "libLLVMInstCombine",
+    name: "libLLVM70InstCombine",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm70-lib-defaults",
     ],
-    generated_headers: ["llvm-gen-instcombine"],
+    generated_headers: ["llvm70-gen-instcombine"],
     srcs: ["*.cpp"],
 }
 
-llvm_tblgen {
-    name: "llvm-gen-instcombine",
+llvm70_tblgen {
+    name: "llvm70-gen-instcombine",
     in: "InstCombineTables.td",
     outs: ["InstCombineTables.inc"],
 }

diff --git a/lib/Transforms/Instrumentation/Android.bp b/lib/Transforms/Instrumentation/Android.bp
index b719f17..daa031b 100644 (file)
--- a/lib/Transforms/Instrumentation/Android.bp
+++ b/lib/Transforms/Instrumentation/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMInstrumentation",
+    name: "libLLVM70Instrumentation",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm70-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/Transforms/ObjCARC/Android.bp b/lib/Transforms/ObjCARC/Android.bp
index 64bc529..d3b05b8 100644 (file)
--- a/lib/Transforms/ObjCARC/Android.bp
+++ b/lib/Transforms/ObjCARC/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMTransformObjCARC",
+    name: "libLLVM70TransformObjCARC",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm70-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/Transforms/Scalar/Android.bp b/lib/Transforms/Scalar/Android.bp
index 42e1eb8..ddcfbf7 100644 (file)
--- a/lib/Transforms/Scalar/Android.bp
+++ b/lib/Transforms/Scalar/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMScalarOpts",
+    name: "libLLVM70ScalarOpts",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm70-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/Transforms/Utils/Android.bp b/lib/Transforms/Utils/Android.bp
index 8fcf7ef..fbd3bfa 100644 (file)
--- a/lib/Transforms/Utils/Android.bp
+++ b/lib/Transforms/Utils/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMTransformUtils",
+    name: "libLLVM70TransformUtils",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm70-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/lib/Transforms/Vectorize/Android.bp b/lib/Transforms/Vectorize/Android.bp
index 78b1685..4f42ebc 100644 (file)
--- a/lib/Transforms/Vectorize/Android.bp
+++ b/lib/Transforms/Vectorize/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMVectorize",
+    name: "libLLVM70Vectorize",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm70-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }

diff --git a/soong/Android.bp b/soong/Android.bp
index fe886dc..227acaf 100644 (file)
--- a/soong/Android.bp
+++ b/soong/Android.bp
@@ -1,6 +1,6 @@
 bootstrap_go_package {
-    name: "soong-llvm",
-    pkgPath: "android/soong/external/llvm",
+    name: "soong-llvm70",
+    pkgPath: "android/soong/external/llvm70",
     deps: [
         "blueprint",
         "blueprint-pathtools",

diff --git a/soong/llvm.go b/soong/llvm.go
index 7ff99bd..ba93b59 100644 (file)
--- a/soong/llvm.go
+++ b/soong/llvm.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package llvm
+package llvm70
 
 import (
        "android/soong/android"
@@ -97,8 +97,8 @@ func forceBuildLlvmComponents(ctx android.LoadHookContext) {
 }
 
 func init() {
-       android.RegisterModuleType("llvm_defaults", llvmDefaultsFactory)
-       android.RegisterModuleType("force_build_llvm_components_defaults", forceBuildLlvmComponentsDefaultsFactory)
+       android.RegisterModuleType("llvm70_defaults", llvmDefaultsFactory)
+       android.RegisterModuleType("force_build_llvm70_components_defaults", forceBuildLlvmComponentsDefaultsFactory)
 }
 
 func llvmDefaultsFactory() android.Module {

diff --git a/soong/tblgen.go b/soong/tblgen.go
index 0b9a2c7..3b2e93b 100644 (file)
--- a/soong/tblgen.go
+++ b/soong/tblgen.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package llvm
+package llvm70
 
 import (
        "path/filepath"
@@ -25,20 +25,20 @@ import (
 )
 
 func init() {
-       android.RegisterModuleType("llvm_tblgen", llvmTblgenFactory)
+       android.RegisterModuleType("llvm70_tblgen", llvm70TblgenFactory)
 }
 
 var (
-       pctx = android.NewPackageContext("android/soong/llvm")
+       pctx = android.NewPackageContext("android/soong/llvm70")
 
-       llvmTblgen = pctx.HostBinToolVariable("llvmTblgen", "llvm-tblgen")
+       llvm70Tblgen = pctx.HostBinToolVariable("llvm70Tblgen", "llvm70-tblgen")
 
-       tblgenRule = pctx.StaticRule("tblgenRule", blueprint.RuleParams{
+       tblgenRule70 = pctx.StaticRule("tblgenRule70", blueprint.RuleParams{
                Depfile:     "${out}.d",
                Deps:        blueprint.DepsGCC,
-               Command:     "${llvmTblgen} ${includes} ${generator} -d ${depfile} -o ${out} ${in}",
-               CommandDeps: []string{"${llvmTblgen}"},
-               Description: "LLVM TableGen $in => $out",
+               Command:     "${llvm70Tblgen} ${includes} ${generator} -d ${depfile} -o ${out} ${in}",
+               CommandDeps: []string{"${llvm70Tblgen}"},
+               Description: "LLVM70 TableGen $in => $out",
        }, "includes", "depfile", "generator")
 )
 
@@ -63,8 +63,8 @@ func (t *tblgen) GenerateAndroidBuildActions(ctx android.ModuleContext) {
 
        includes := []string{
                "-I " + ctx.ModuleDir(),
-               "-I external/llvm/include",
-               "-I external/llvm/lib/Target",
+               "-I external/llvm70/include",
+               "-I external/llvm70/lib/Target",
                "-I " + filepath.Dir(in.String()),
        }
 
@@ -73,7 +73,7 @@ func (t *tblgen) GenerateAndroidBuildActions(ctx android.ModuleContext) {
                generator := outToGenerator(ctx, o)
 
                ctx.ModuleBuild(pctx, android.ModuleBuildParams{
-                       Rule:   tblgenRule,
+                       Rule:   tblgenRule70,
                        Input:  in,
                        Output: out,
                        Args: map[string]string{
@@ -165,7 +165,7 @@ func (t *tblgen) GeneratedSourceFiles() android.Paths {
        return t.generatedHeaders
 }
 
-func llvmTblgenFactory() android.Module {
+func llvm70TblgenFactory() android.Module {
        t := &tblgen{}
        t.AddProperties(&t.properties)
        android.InitAndroidModule(t)

diff --git a/tools/bugpoint-passes/Android.bp b/tools/bugpoint-passes/Android.bp
index 925c2bd..7d75bed 100644 (file)
--- a/tools/bugpoint-passes/Android.bp
+++ b/tools/bugpoint-passes/Android.bp
@@ -3,7 +3,7 @@
 
 cc_library_host_shared {
     name: "BugpointPasses",
-    defaults: ["llvm-defaults"],
+    defaults: ["llvm70-defaults"],
     srcs: ["TestPasses.cpp"],
     allow_undefined_symbols: true,
     target: {

diff --git a/tools/bugpoint/Android.bp b/tools/bugpoint/Android.bp
index 89514b8..c9faf0f 100644 (file)
--- a/tools/bugpoint/Android.bp
+++ b/tools/bugpoint/Android.bp
@@ -5,30 +5,30 @@
 
 cc_binary_host {
     name: "bugpoint",
-    defaults: ["llvm-defaults"],
+    defaults: ["llvm70-defaults"],
     srcs: ["*.cpp"],
     static_libs: [
-        "libLLVMBitWriter",
-        "libLLVMCodeGen",
-        "libLLVMipo",
-        "libLLVMIRReader",
-        "libLLVMBitReader",
-        "libLLVMAsmParser",
-        "libLLVMInstCombine",
-        "libLLVMInstrumentation",
-        "libLLVMLinker",
-        "libLLVMTransformObjCARC",
-        "libLLVMObject",
-        "libLLVMScalarOpts",
-        "libLLVMTransformUtils",
-        "libLLVMAnalysis",
-        "libLLVMTarget",
-        "libLLVMCore",
-        "libLLVMMC",
-        "libLLVMMCParser",
-        "libLLVMProfileData",
-        "libLLVMVectorize",
-        "libLLVMSupport",
+        "libLLVM70BitWriter",
+        "libLLVM70CodeGen",
+        "libLLVM70ipo",
+        "libLLVM70IRReader",
+        "libLLVM70BitReader",
+        "libLLVM70AsmParser",
+        "libLLVM70InstCombine",
+        "libLLVM70Instrumentation",
+        "libLLVM70Linker",
+        "libLLVM70TransformObjCARC",
+        "libLLVM70Object",
+        "libLLVM70ScalarOpts",
+        "libLLVM70TransformUtils",
+        "libLLVM70Analysis",
+        "libLLVM70Target",
+        "libLLVM70Core",
+        "libLLVM70MC",
+        "libLLVM70MCParser",
+        "libLLVM70ProfileData",
+        "libLLVM70Vectorize",
+        "libLLVM70Support",
     ],
     target: {
         darwin: {

diff --git a/tools/dsymutil/Android.bp b/tools/dsymutil/Android.bp
index 731d6c9..d5a4d6c 100644 (file)
--- a/tools/dsymutil/Android.bp
+++ b/tools/dsymutil/Android.bp
@@ -1,53 +1,53 @@
 cc_binary_host {
     name: "llvm-dsymutil",
-    defaults: ["llvm-defaults"],
+    defaults: ["llvm70-defaults"],
     srcs: ["*.cpp"],
     static_libs: [
-        "libLLVMARMCodeGen",
-        "libLLVMARMAsmParser",
-        "libLLVMARMInfo",
-        "libLLVMARMDesc",
-        "libLLVMARMAsmPrinter",
-        "libLLVMARMDisassembler",
-        "libLLVMAArch64CodeGen",
-        "libLLVMAArch64Info",
-        "libLLVMAArch64AsmParser",
-        "libLLVMAArch64Desc",
-        "libLLVMAArch64AsmPrinter",
-        "libLLVMAArch64Utils",
-        "libLLVMAArch64Disassembler",
-        "libLLVMMipsCodeGen",
-        "libLLVMMipsInfo",
-        "libLLVMMipsAsmParser",
-        "libLLVMMipsDesc",
-        "libLLVMMipsAsmPrinter",
-        "libLLVMMipsDisassembler",
-        "libLLVMX86CodeGen",
-        "libLLVMX86Info",
-        "libLLVMX86Desc",
-        "libLLVMX86AsmParser",
-        "libLLVMX86AsmPrinter",
-        "libLLVMX86Utils",
-        "libLLVMX86Disassembler",
-        "libLLVMX86CodeGen",
-        "libLLVMAsmPrinter",
-        "libLLVMDebugInfoCodeView",
-        "libLLVMSelectionDAG",
-        "libLLVMCodeGen",
-        "libLLVMProfileData",
-        "libLLVMGlobalISel",
-        "libLLVMDebugInfoDWARF",
-        "libLLVMInstrumentation",
-        "libLLVMMCParser",
-        "libLLVMMCDisassembler",
-        "libLLVMObject",
-        "libLLVMBitReader",
-        "libLLVMScalarOpts",
-        "libLLVMTransformUtils",
-        "libLLVMAnalysis",
-        "libLLVMTarget",
-        "libLLVMCore",
-        "libLLVMMC",
-        "libLLVMSupport",
+        "libLLVM70ARMCodeGen",
+        "libLLVM70ARMAsmParser",
+        "libLLVM70ARMInfo",
+        "libLLVM70ARMDesc",
+        "libLLVM70ARMAsmPrinter",
+        "libLLVM70ARMDisassembler",
+        "libLLVM70AArch64CodeGen",
+        "libLLVM70AArch64Info",
+        "libLLVM70AArch64AsmParser",
+        "libLLVM70AArch64Desc",
+        "libLLVM70AArch64AsmPrinter",
+        "libLLVM70AArch64Utils",
+        "libLLVM70AArch64Disassembler",
+        "libLLVM70MipsCodeGen",
+        "libLLVM70MipsInfo",
+        "libLLVM70MipsAsmParser",
+        "libLLVM70MipsDesc",
+        "libLLVM70MipsAsmPrinter",
+        "libLLVM70MipsDisassembler",
+        "libLLVM70X86CodeGen",
+        "libLLVM70X86Info",
+        "libLLVM70X86Desc",
+        "libLLVM70X86AsmParser",
+        "libLLVM70X86AsmPrinter",
+        "libLLVM70X86Utils",
+        "libLLVM70X86Disassembler",
+        "libLLVM70X86CodeGen",
+        "libLLVM70AsmPrinter",
+        "libLLVM70DebugInfoCodeView",
+        "libLLVM70SelectionDAG",
+        "libLLVM70CodeGen",
+        "libLLVM70ProfileData",
+        "libLLVM70GlobalISel",
+        "libLLVM70DebugInfoDWARF",
+        "libLLVM70Instrumentation",
+        "libLLVM70MCParser",
+        "libLLVM70MCDisassembler",
+        "libLLVM70Object",
+        "libLLVM70BitReader",
+        "libLLVM70ScalarOpts",
+        "libLLVM70TransformUtils",
+        "libLLVM70Analysis",
+        "libLLVM70Target",
+        "libLLVM70Core",
+        "libLLVM70MC",
+        "libLLVM70Support",
     ],
 }

diff --git a/tools/gold/Android.bp b/tools/gold/Android.bp
index c7134d8..8c85c06 100644 (file)
--- a/tools/gold/Android.bp
+++ b/tools/gold/Android.bp
@@ -18,10 +18,10 @@
 // =====================================================
 
 cc_library_host_shared {
-    name: "LLVMgold",
-    defaults: ["llvm-defaults"],
+    name: "LLVM70gold",
+    defaults: ["llvm70-defaults"],
     srcs: ["gold-plugin.cpp"],
-    shared_libs: ["libLLVM"],
+    shared_libs: ["libLLVM70"],
     include_dirs: ["toolchain/binutils/binutils-2.25/include"],
     compile_multilib: "first",
 }

diff --git a/tools/llc/Android.bp b/tools/llc/Android.bp
index efe7b98..5e223f0 100644 (file)
--- a/tools/llc/Android.bp
+++ b/tools/llc/Android.bp
@@ -3,40 +3,40 @@
 //===---------------------------------------------------------------===
 
 llvm_llc_mips_STATIC_LIBRARIES = [
-    "libLLVMMipsAsmParser",
-    "libLLVMMipsInfo",
-    "libLLVMMipsCodeGen",
-    "libLLVMMipsDesc",
-    "libLLVMMipsAsmPrinter",
+    "libLLVM70MipsAsmParser",
+    "libLLVM70MipsInfo",
+    "libLLVM70MipsCodeGen",
+    "libLLVM70MipsDesc",
+    "libLLVM70MipsAsmPrinter",
 ]
 
 llvm_llc_x86_STATIC_LIBRARIES = [
-    "libLLVMX86Info",
-    "libLLVMX86AsmParser",
-    "libLLVMX86CodeGen",
-    "libLLVMX86Disassembler",
-    "libLLVMX86Desc",
-    "libLLVMX86AsmPrinter",
-    "libLLVMX86Utils",
+    "libLLVM70X86Info",
+    "libLLVM70X86AsmParser",
+    "libLLVM70X86CodeGen",
+    "libLLVM70X86Disassembler",
+    "libLLVM70X86Desc",
+    "libLLVM70X86AsmPrinter",
+    "libLLVM70X86Utils",
 ]
 
 llvm_llc_arm_STATIC_LIBRARIES = [
-    "libLLVMARMCodeGen",
-    "libLLVMARMDisassembler",
-    "libLLVMARMAsmParser",
-    "libLLVMARMAsmPrinter",
-    "libLLVMARMDesc",
-    "libLLVMARMInfo",
+    "libLLVM70ARMCodeGen",
+    "libLLVM70ARMDisassembler",
+    "libLLVM70ARMAsmParser",
+    "libLLVM70ARMAsmPrinter",
+    "libLLVM70ARMDesc",
+    "libLLVM70ARMInfo",
 ]
 
 llvm_llc_aarch64_STATIC_LIBRARIES = [
-    "libLLVMAArch64Info",
-    "libLLVMAArch64AsmParser",
-    "libLLVMAArch64CodeGen",
-    "libLLVMAArch64Disassembler",
-    "libLLVMAArch64Desc",
-    "libLLVMAArch64AsmPrinter",
-    "libLLVMAArch64Utils",
+    "libLLVM70AArch64Info",
+    "libLLVM70AArch64AsmParser",
+    "libLLVM70AArch64CodeGen",
+    "libLLVM70AArch64Disassembler",
+    "libLLVM70AArch64Desc",
+    "libLLVM70AArch64AsmPrinter",
+    "libLLVM70AArch64Utils",
 ]
 
 //===---------------------------------------------------------------===
@@ -45,36 +45,36 @@ llvm_llc_aarch64_STATIC_LIBRARIES = [
 
 cc_binary_host {
     name: "llc",
-    defaults: ["llvm-defaults"],
+    defaults: ["llvm70-defaults"],
     srcs: ["llc.cpp"],
     static_libs: [
-        "libLLVMGlobalISel",
-        "libLLVMAsmPrinter",
-        "libLLVMDebugInfoCodeView",
-        "libLLVMIRReader",
-        "libLLVMAsmParser",
-        "libLLVMBitReader",
-        "libLLVMBitWriter",
-        "libLLVMSelectionDAG",
-        "libLLVMInstCombine",
-        "libLLVMCodeGen",
-        "libLLVMProfileData",
-        "libLLVMInstrumentation",
-        "libLLVMObject",
-        "libLLVMipo",
-        "libLLVMLinker",
-        "libLLVMMCDisassembler",
-        "libLLVMMC",
-        "libLLVMMIRParser",
-        "libLLVMMCParser",
-        "libLLVMScalarOpts",
-        "libLLVMTransformUtils",
-        "libLLVMVectorize",
-        "libLLVMAnalysis",
-        "libLLVMTarget",
-        "libLLVMCore",
-        "libLLVMSupport",
-        "libLLVMObject",
+        "libLLVM70GlobalISel",
+        "libLLVM70AsmPrinter",
+        "libLLVM70DebugInfoCodeView",
+        "libLLVM70IRReader",
+        "libLLVM70AsmParser",
+        "libLLVM70BitReader",
+        "libLLVM70BitWriter",
+        "libLLVM70SelectionDAG",
+        "libLLVM70InstCombine",
+        "libLLVM70CodeGen",
+        "libLLVM70ProfileData",
+        "libLLVM70Instrumentation",
+        "libLLVM70Object",
+        "libLLVM70ipo",
+        "libLLVM70Linker",
+        "libLLVM70MCDisassembler",
+        "libLLVM70MC",
+        "libLLVM70MIRParser",
+        "libLLVM70MCParser",
+        "libLLVM70ScalarOpts",
+        "libLLVM70TransformUtils",
+        "libLLVM70Vectorize",
+        "libLLVM70Analysis",
+        "libLLVM70Target",
+        "libLLVM70Core",
+        "libLLVM70Support",
+        "libLLVM70Object",
     ],
     target: {
         host: {

diff --git a/tools/lli/Android.bp b/tools/lli/Android.bp
index 4ab66bc..89a6f80 100644 (file)
--- a/tools/lli/Android.bp
+++ b/tools/lli/Android.bp
@@ -4,65 +4,65 @@
 
 cc_binary_host {
     name: "lli",
-    defaults: ["llvm-defaults"],
+    defaults: ["llvm70-defaults"],
     srcs: [
         "lli.cpp",
         "OrcLazyJIT.cpp",
     ],
     static_libs: [
-        "libLLVMIRReader",
-        "libLLVMBitReader",
-        "libLLVMARMCodeGen",
-        "libLLVMARMInfo",
-        "libLLVMARMDesc",
-        "libLLVMARMAsmPrinter",
-        "libLLVMARMAsmParser",
-        "libLLVMARMDisassembler",
-        "libLLVMAArch64CodeGen",
-        "libLLVMAArch64Info",
-        "libLLVMAArch64Desc",
-        "libLLVMAArch64AsmPrinter",
-        "libLLVMAArch64AsmParser",
-        "libLLVMAArch64Utils",
-        "libLLVMAArch64Disassembler",
-        "libLLVMMipsCodeGen",
-        "libLLVMMipsInfo",
-        "libLLVMMipsDesc",
-        "libLLVMMipsAsmPrinter",
-        "libLLVMMipsAsmParser",
-        "libLLVMMipsDisassembler",
-        "libLLVMX86CodeGen",
-        "libLLVMX86Info",
-        "libLLVMX86Desc",
-        "libLLVMX86AsmPrinter",
-        "libLLVMX86AsmParser",
-        "libLLVMX86Utils",
-        "libLLVMX86Disassembler",
-        "libLLVMAsmPrinter",
-        "libLLVMGlobalISel",
-        "libLLVMDebugInfoCodeView",
-        "libLLVMSelectionDAG",
-        "libLLVMCodeGen",
-        "libLLVMProfileData",
-        "libLLVMInstrumentation",
-        "libLLVMLinker",
-        "libLLVMInterpreter",
-        "libLLVMScalarOpts",
-        "libLLVMTransformUtils",
-        "libLLVMAnalysis",
-        "libLLVMTarget",
-        "libLLVMMC",
-        "libLLVMMCJIT",
-        "libLLVMOrcJIT",
-        "libLLVMExecutionEngine",
-        "libLLVMRuntimeDyld",
-        "libLLVMMCParser",
-        "libLLVMObject",
-        "libLLVMCore",
-        "libLLVMAsmParser",
-        "libLLVMOption",
-        "libLLVMSupport",
-        "libLLVMMCDisassembler",
+        "libLLVM70IRReader",
+        "libLLVM70BitReader",
+        "libLLVM70ARMCodeGen",
+        "libLLVM70ARMInfo",
+        "libLLVM70ARMDesc",
+        "libLLVM70ARMAsmPrinter",
+        "libLLVM70ARMAsmParser",
+        "libLLVM70ARMDisassembler",
+        "libLLVM70AArch64CodeGen",
+        "libLLVM70AArch64Info",
+        "libLLVM70AArch64Desc",
+        "libLLVM70AArch64AsmPrinter",
+        "libLLVM70AArch64AsmParser",
+        "libLLVM70AArch64Utils",
+        "libLLVM70AArch64Disassembler",
+        "libLLVM70MipsCodeGen",
+        "libLLVM70MipsInfo",
+        "libLLVM70MipsDesc",
+        "libLLVM70MipsAsmPrinter",
+        "libLLVM70MipsAsmParser",
+        "libLLVM70MipsDisassembler",
+        "libLLVM70X86CodeGen",
+        "libLLVM70X86Info",
+        "libLLVM70X86Desc",
+        "libLLVM70X86AsmPrinter",
+        "libLLVM70X86AsmParser",
+        "libLLVM70X86Utils",
+        "libLLVM70X86Disassembler",
+        "libLLVM70AsmPrinter",
+        "libLLVM70GlobalISel",
+        "libLLVM70DebugInfoCodeView",
+        "libLLVM70SelectionDAG",
+        "libLLVM70CodeGen",
+        "libLLVM70ProfileData",
+        "libLLVM70Instrumentation",
+        "libLLVM70Linker",
+        "libLLVM70Interpreter",
+        "libLLVM70ScalarOpts",
+        "libLLVM70TransformUtils",
+        "libLLVM70Analysis",
+        "libLLVM70Target",
+        "libLLVM70MC",
+        "libLLVM70MCJIT",
+        "libLLVM70OrcJIT",
+        "libLLVM70ExecutionEngine",
+        "libLLVM70RuntimeDyld",
+        "libLLVM70MCParser",
+        "libLLVM70Object",
+        "libLLVM70Core",
+        "libLLVM70AsmParser",
+        "libLLVM70Option",
+        "libLLVM70Support",
+        "libLLVM70MCDisassembler",
     ],
 }
 

diff --git a/tools/lli/ChildTarget/Android.bp b/tools/lli/ChildTarget/Android.bp
index a3f67cc..d942a13 100644 (file)
--- a/tools/lli/ChildTarget/Android.bp
+++ b/tools/lli/ChildTarget/Android.bp
@@ -4,16 +4,16 @@
 
 cc_binary_host {
     name: "lli-child-target",
-    defaults: ["llvm-defaults"],
+    defaults: ["llvm70-defaults"],
     srcs: ["ChildTarget.cpp"],
     static_libs: [
-        "libLLVMOrcJIT",
-        "libLLVMRuntimeDyld",
-        "libLLVMObject",
-        "libLLVMBitReader",
-        "libLLVMMC",
-        "libLLVMMCParser",
-        "libLLVMCore",
-        "libLLVMSupport",
+        "libLLVM70OrcJIT",
+        "libLLVM70RuntimeDyld",
+        "libLLVM70Object",
+        "libLLVM70BitReader",
+        "libLLVM70MC",
+        "libLLVM70MCParser",
+        "libLLVM70Core",
+        "libLLVM70Support",
     ],
 }

diff --git a/tools/llvm-ar/Android.bp b/tools/llvm-ar/Android.bp
index 2cf5157..9122a5d 100644 (file)
--- a/tools/llvm-ar/Android.bp
+++ b/tools/llvm-ar/Android.bp
@@ -4,9 +4,9 @@
 
 cc_binary_host {
     name: "llvm-ar",
-    defaults: ["llvm-defaults"],
+    defaults: ["llvm70-defaults"],
     srcs: ["llvm-ar.cpp"],
-    shared_libs: ["libLLVM"],
+    shared_libs: ["libLLVM70"],
     symlinks: [
         "llvm-lib",
         "llvm-ranlib",

diff --git a/tools/llvm-as/Android.bp b/tools/llvm-as/Android.bp
index f79f39c..5b0273e 100644 (file)
--- a/tools/llvm-as/Android.bp
+++ b/tools/llvm-as/Android.bp
@@ -1,12 +1,12 @@
 cc_binary_host {
     name: "llvm-as",
-    defaults: ["llvm-defaults"],
+    defaults: ["llvm70-defaults"],
     srcs: ["llvm-as.cpp"],
     static_libs: [
-        "libLLVMAsmParser",
-        "libLLVMBitWriter",
-        "libLLVMAnalysis",
-        "libLLVMCore",
-        "libLLVMSupport",
+        "libLLVM70AsmParser",
+        "libLLVM70BitWriter",
+        "libLLVM70Analysis",
+        "libLLVM70Core",
+        "libLLVM70Support",
     ],
 }

diff --git a/tools/llvm-bcanalyzer/Android.bp b/tools/llvm-bcanalyzer/Android.bp
index 81f80ea..376f46d 100644 (file)
--- a/tools/llvm-bcanalyzer/Android.bp
+++ b/tools/llvm-bcanalyzer/Android.bp
@@ -4,11 +4,11 @@
 
 cc_binary_host {
     name: "llvm-bcanalyzer",
-    defaults: ["llvm-defaults"],
+    defaults: ["llvm70-defaults"],
     srcs: ["llvm-bcanalyzer.cpp"],
     static_libs: [
-        "libLLVMBitReader",
-        "libLLVMCore",
-        "libLLVMSupport",
+        "libLLVM70BitReader",
+        "libLLVM70Core",
+        "libLLVM70Support",
     ],
 }

diff --git a/tools/llvm-c-test/Android.bp b/tools/llvm-c-test/Android.bp
index e89bae7..ababa10 100644 (file)
--- a/tools/llvm-c-test/Android.bp
+++ b/tools/llvm-c-test/Android.bp
@@ -4,52 +4,52 @@
 
 cc_binary_host {
     name: "llvm-c-test",
-    defaults: ["llvm-defaults"],
+    defaults: ["llvm70-defaults"],
     srcs: [
         "*.c",
         "*.cpp",
     ],
     static_libs: [
-        "libLLVMBitReader",
-        "libLLVMARMCodeGen",
-        "libLLVMARMInfo",
-        "libLLVMARMDesc",
-        "libLLVMARMAsmPrinter",
-        "libLLVMARMDisassembler",
-        "libLLVMAArch64CodeGen",
-        "libLLVMAArch64Info",
-        "libLLVMAArch64Desc",
-        "libLLVMAArch64AsmPrinter",
-        "libLLVMAArch64Utils",
-        "libLLVMAArch64Disassembler",
-        "libLLVMMipsCodeGen",
-        "libLLVMMipsInfo",
-        "libLLVMMipsDesc",
-        "libLLVMMipsAsmPrinter",
-        "libLLVMMipsDisassembler",
-        "libLLVMX86CodeGen",
-        "libLLVMX86Info",
-        "libLLVMX86Desc",
-        "libLLVMX86AsmPrinter",
-        "libLLVMX86Utils",
-        "libLLVMX86Disassembler",
-        "libLLVMAsmPrinter",
-        "libLLVMSelectionDAG",
-        "libLLVMCodeGen",
-        "libLLVMGlobalISel",
-        "libLLVMProfileData",
-        "libLLVMInstrumentation",
-        "libLLVMScalarOpts",
-        "libLLVMTransformUtils",
-        "libLLVMAnalysis",
-        "libLLVMTarget",
-        "libLLVMMC",
-        "libLLVMObject",
-        "libLLVMMCParser",
-        "libLLVMCore",
-        "libLLVMAsmParser",
-        "libLLVMOption",
-        "libLLVMSupport",
-        "libLLVMMCDisassembler",
+        "libLLVM70BitReader",
+        "libLLVM70ARMCodeGen",
+        "libLLVM70ARMInfo",
+        "libLLVM70ARMDesc",
+        "libLLVM70ARMAsmPrinter",
+        "libLLVM70ARMDisassembler",
+        "libLLVM70AArch64CodeGen",
+        "libLLVM70AArch64Info",
+        "libLLVM70AArch64Desc",
+        "libLLVM70AArch64AsmPrinter",
+        "libLLVM70AArch64Utils",
+        "libLLVM70AArch64Disassembler",
+        "libLLVM70MipsCodeGen",
+        "libLLVM70MipsInfo",
+        "libLLVM70MipsDesc",
+        "libLLVM70MipsAsmPrinter",
+        "libLLVM70MipsDisassembler",
+        "libLLVM70X86CodeGen",
+        "libLLVM70X86Info",
+        "libLLVM70X86Desc",
+        "libLLVM70X86AsmPrinter",
+        "libLLVM70X86Utils",
+        "libLLVM70X86Disassembler",
+        "libLLVM70AsmPrinter",
+        "libLLVM70SelectionDAG",
+        "libLLVM70CodeGen",
+        "libLLVM70GlobalISel",
+        "libLLVM70ProfileData",
+        "libLLVM70Instrumentation",
+        "libLLVM70ScalarOpts",
+        "libLLVM70TransformUtils",
+        "libLLVM70Analysis",
+        "libLLVM70Target",
+        "libLLVM70MC",
+        "libLLVM70Object",
+        "libLLVM70MCParser",
+        "libLLVM70Core",
+        "libLLVM70AsmParser",
+        "libLLVM70Option",
+        "libLLVM70Support",
+        "libLLVM70MCDisassembler",
     ],
 }

diff --git a/tools/llvm-config/Android.bp b/tools/llvm-config/Android.bp
index 6f45736..d5a2b6e 100644 (file)
--- a/tools/llvm-config/Android.bp
+++ b/tools/llvm-config/Android.bp
@@ -1,15 +1,15 @@
 //===---------------------------------------------------------------===
-// llvm-config command line tool
+// llvm70-config command line tool
 //===---------------------------------------------------------------===
 
 cc_binary_host {
-    name: "llvm-config",
-    defaults: ["llvm-defaults"],
+    name: "llvm70-config",
+    defaults: ["llvm70-defaults"],
     generated_headers: ["llvm-gen-config"],
     srcs: ["llvm-config.cpp"],
     static_libs: [
-        "libLLVMCore",
-        "libLLVMSupport",
+        "libLLVM70Core",
+        "libLLVM70Support",
     ],
 }
 

diff --git a/tools/llvm-cov/Android.bp b/tools/llvm-cov/Android.bp
index fb7e7e7..940743a 100644 (file)
--- a/tools/llvm-cov/Android.bp
+++ b/tools/llvm-cov/Android.bp
@@ -4,16 +4,16 @@
 
 cc_binary_host {
     name: "llvm-cov",
-    defaults: ["llvm-defaults"],
+    defaults: ["llvm70-defaults"],
     srcs: ["*.cpp"],
     static_libs: [
-        "libLLVMObject",
-        "libLLVMProfileDataCoverage",
-        "libLLVMProfileData",
-        "libLLVMMC",
-        "libLLVMMCParser",
-        "libLLVMBitReader",
-        "libLLVMCore",
-        "libLLVMSupport",
+        "libLLVM70Object",
+        "libLLVM70ProfileDataCoverage",
+        "libLLVM70ProfileData",
+        "libLLVM70MC",
+        "libLLVM70MCParser",
+        "libLLVM70BitReader",
+        "libLLVM70Core",
+        "libLLVM70Support",
     ],
 }

diff --git a/tools/llvm-cxxdump/Android.bp b/tools/llvm-cxxdump/Android.bp
index ef1aa93..2b3155f 100644 (file)
--- a/tools/llvm-cxxdump/Android.bp
+++ b/tools/llvm-cxxdump/Android.bp
@@ -1,46 +1,46 @@
 cc_binary_host {
     name: "llvm-cxxdump",
-    defaults: ["llvm-defaults"],
+    defaults: ["llvm70-defaults"],
     srcs: [
         "Error.cpp",
         "llvm-cxxdump.cpp",
     ],
 
     static_libs: [
-        "libLLVMARMAsmParser",
-        "libLLVMARMInfo",
-        "libLLVMARMDesc",
-        "libLLVMARMAsmPrinter",
-        "libLLVMARMDisassembler",
-        "libLLVMAArch64Info",
-        "libLLVMAArch64AsmParser",
-        "libLLVMAArch64Desc",
-        "libLLVMAArch64AsmPrinter",
-        "libLLVMAArch64Utils",
-        "libLLVMAArch64Disassembler",
-        "libLLVMMipsInfo",
-        "libLLVMMipsAsmParser",
-        "libLLVMMipsDesc",
-        "libLLVMMipsAsmPrinter",
-        "libLLVMMipsDisassembler",
-        "libLLVMX86Info",
-        "libLLVMX86Desc",
-        "libLLVMX86AsmParser",
-        "libLLVMX86CodeGen",
-        "libLLVMX86AsmPrinter",
-        "libLLVMX86Utils",
-        "libLLVMX86Disassembler",
-        "libLLVMAsmPrinter",
-        "libLLVMCodeGen",
-        "libLLVMAnalysis",
-        "libLLVMTarget",
-        "libLLVMObject",
-        "libLLVMMCParser",
-        "libLLVMMC",
-        "libLLVMMCDisassembler",
-        "libLLVMBitReader",
-        "libLLVMCore",
-        "libLLVMAsmParser",
-        "libLLVMSupport",
+        "libLLVM70ARMAsmParser",
+        "libLLVM70ARMInfo",
+        "libLLVM70ARMDesc",
+        "libLLVM70ARMAsmPrinter",
+        "libLLVM70ARMDisassembler",
+        "libLLVM70AArch64Info",
+        "libLLVM70AArch64AsmParser",
+        "libLLVM70AArch64Desc",
+        "libLLVM70AArch64AsmPrinter",
+        "libLLVM70AArch64Utils",
+        "libLLVM70AArch64Disassembler",
+        "libLLVM70MipsInfo",
+        "libLLVM70MipsAsmParser",
+        "libLLVM70MipsDesc",
+        "libLLVM70MipsAsmPrinter",
+        "libLLVM70MipsDisassembler",
+        "libLLVM70X86Info",
+        "libLLVM70X86Desc",
+        "libLLVM70X86AsmParser",
+        "libLLVM70X86CodeGen",
+        "libLLVM70X86AsmPrinter",
+        "libLLVM70X86Utils",
+        "libLLVM70X86Disassembler",
+        "libLLVM70AsmPrinter",
+        "libLLVM70CodeGen",
+        "libLLVM70Analysis",
+        "libLLVM70Target",
+        "libLLVM70Object",
+        "libLLVM70MCParser",
+        "libLLVM70MC",
+        "libLLVM70MCDisassembler",
+        "libLLVM70BitReader",
+        "libLLVM70Core",
+        "libLLVM70AsmParser",
+        "libLLVM70Support",
     ],
 }

diff --git a/tools/llvm-diff/Android.bp b/tools/llvm-diff/Android.bp
index 91ca31b..4d44cef 100644 (file)
--- a/tools/llvm-diff/Android.bp
+++ b/tools/llvm-diff/Android.bp
@@ -4,7 +4,7 @@
 
 cc_binary_host {
     name: "llvm-diff",
-    defaults: ["llvm-defaults"],
+    defaults: ["llvm70-defaults"],
     srcs: [
         "llvm-diff.cpp",
         "DiffConsumer.cpp",
@@ -12,10 +12,10 @@ cc_binary_host {
         "DiffLog.cpp",
     ],
     static_libs: [
-        "libLLVMIRReader",
-        "libLLVMBitReader",
-        "libLLVMAsmParser",
-        "libLLVMCore",
-        "libLLVMSupport",
+        "libLLVM70IRReader",
+        "libLLVM70BitReader",
+        "libLLVM70AsmParser",
+        "libLLVM70Core",
+        "libLLVM70Support",
     ],
 }

diff --git a/tools/llvm-dis/Android.bp b/tools/llvm-dis/Android.bp
index 1b21e5f..b3edf98 100644 (file)
--- a/tools/llvm-dis/Android.bp
+++ b/tools/llvm-dis/Android.bp
@@ -1,11 +1,11 @@
 cc_binary_host {
     name: "llvm-dis",
-    defaults: ["llvm-defaults"],
+    defaults: ["llvm70-defaults"],
     srcs: ["llvm-dis.cpp"],
     static_libs: [
-        "libLLVMAnalysis",
-        "libLLVMBitReader",
-        "libLLVMCore",
-        "libLLVMSupport",
+        "libLLVM70Analysis",
+        "libLLVM70BitReader",
+        "libLLVM70Core",
+        "libLLVM70Support",
     ],
 }

diff --git a/tools/llvm-dwarfdump/Android.bp b/tools/llvm-dwarfdump/Android.bp
index e3583cd..c43bb82 100644 (file)
--- a/tools/llvm-dwarfdump/Android.bp
+++ b/tools/llvm-dwarfdump/Android.bp
@@ -4,16 +4,16 @@
 
 cc_binary_host {
     name: "llvm-dwarfdump",
-    defaults: ["llvm-defaults"],
+    defaults: ["llvm70-defaults"],
     srcs: ["llvm-dwarfdump.cpp"],
     static_libs: [
-        "libLLVMDebugInfoDWARF",
-        "libLLVMDebugInfoPDB",
-        "libLLVMObject",
-        "libLLVMBitReader",
-        "libLLVMMC",
-        "libLLVMMCParser",
-        "libLLVMCore",
-        "libLLVMSupport",
+        "libLLVM70DebugInfoDWARF",
+        "libLLVM70DebugInfoPDB",
+        "libLLVM70Object",
+        "libLLVM70BitReader",
+        "libLLVM70MC",
+        "libLLVM70MCParser",
+        "libLLVM70Core",
+        "libLLVM70Support",
     ],
 }

diff --git a/tools/llvm-dwp/Android.bp b/tools/llvm-dwp/Android.bp
index 3545cee..b4ae383 100644 (file)
--- a/tools/llvm-dwp/Android.bp
+++ b/tools/llvm-dwp/Android.bp
@@ -4,65 +4,65 @@
 
 cc_binary_host {
     name: "llvm-dwp",
-    defaults: ["llvm-defaults"],
+    defaults: ["llvm70-defaults"],
 
     srcs: ["*.cpp"],
 
     static_libs: [
-        "libLLVMDebugInfoDWARF",
-        "libLLVMObject",
-        "libLLVMBitReader",
-        "libLLVMARMCodeGen",
-        "libLLVMARMAsmParser",
-        "libLLVMARMAsmPrinter",
-        "libLLVMARMInfo",
-        "libLLVMARMDesc",
-        "libLLVMARMDisassembler",
-        "libLLVMMipsCodeGen",
-        "libLLVMMipsInfo",
-        "libLLVMMipsDesc",
-        "libLLVMMipsAsmParser",
-        "libLLVMMipsAsmPrinter",
-        "libLLVMMipsDisassembler",
-        "libLLVMX86CodeGen",
-        "libLLVMX86Info",
-        "libLLVMX86Desc",
-        "libLLVMX86AsmParser",
-        "libLLVMX86AsmPrinter",
-        "libLLVMX86Utils",
-        "libLLVMX86Disassembler",
-        "libLLVMAArch64CodeGen",
-        "libLLVMAArch64Info",
-        "libLLVMAArch64Desc",
-        "libLLVMAArch64AsmParser",
-        "libLLVMAArch64AsmPrinter",
-        "libLLVMAArch64Utils",
-        "libLLVMAArch64Disassembler",
-        "libLLVMExecutionEngine",
-        "libLLVMRuntimeDyld",
-        "libLLVMMCJIT",
-        "libLLVMOrcJIT",
-        "libLLVMGlobalISel",
-        "libLLVMAsmPrinter",
-        "libLLVMDebugInfoCodeView",
-        "libLLVMSelectionDAG",
-        "libLLVMCodeGen",
-        "libLLVMScalarOpts",
-        "libLLVMInstCombine",
-        "libLLVMInstrumentation",
-        "libLLVMTransformObjCARC",
-        "libLLVMTransformUtils",
-        "libLLVMVectorize",
-        "libLLVMAnalysis",
-        "libLLVMTarget",
-        "libLLVMMCDisassembler",
-        "libLLVMMC",
-        "libLLVMMCParser",
-        "libLLVMCore",
-        "libLLVMAsmParser",
-        "libLLVMOption",
-        "libLLVMLTO",
-        "libLLVMSupport",
-        "libLLVMProfileData",
+        "libLLVM70DebugInfoDWARF",
+        "libLLVM70Object",
+        "libLLVM70BitReader",
+        "libLLVM70ARMCodeGen",
+        "libLLVM70ARMAsmParser",
+        "libLLVM70ARMAsmPrinter",
+        "libLLVM70ARMInfo",
+        "libLLVM70ARMDesc",
+        "libLLVM70ARMDisassembler",
+        "libLLVM70MipsCodeGen",
+        "libLLVM70MipsInfo",
+        "libLLVM70MipsDesc",
+        "libLLVM70MipsAsmParser",
+        "libLLVM70MipsAsmPrinter",
+        "libLLVM70MipsDisassembler",
+        "libLLVM70X86CodeGen",
+        "libLLVM70X86Info",
+        "libLLVM70X86Desc",
+        "libLLVM70X86AsmParser",
+        "libLLVM70X86AsmPrinter",
+        "libLLVM70X86Utils",
+        "libLLVM70X86Disassembler",
+        "libLLVM70AArch64CodeGen",
+        "libLLVM70AArch64Info",
+        "libLLVM70AArch64Desc",
+        "libLLVM70AArch64AsmParser",
+        "libLLVM70AArch64AsmPrinter",
+        "libLLVM70AArch64Utils",
+        "libLLVM70AArch64Disassembler",
+        "libLLVM70ExecutionEngine",
+        "libLLVM70RuntimeDyld",
+        "libLLVM70MCJIT",
+        "libLLVM70OrcJIT",
+        "libLLVM70GlobalISel",
+        "libLLVM70AsmPrinter",
+        "libLLVM70DebugInfoCodeView",
+        "libLLVM70SelectionDAG",
+        "libLLVM70CodeGen",
+        "libLLVM70ScalarOpts",
+        "libLLVM70InstCombine",
+        "libLLVM70Instrumentation",
+        "libLLVM70TransformObjCARC",
+        "libLLVM70TransformUtils",
+        "libLLVM70Vectorize",
+        "libLLVM70Analysis",
+        "libLLVM70Target",
+        "libLLVM70MCDisassembler",
+        "libLLVM70MC",
+        "libLLVM70MCParser",
+        "libLLVM70Core",
+        "libLLVM70AsmParser",
+        "libLLVM70Option",
+        "libLLVM70LTO",
+        "libLLVM70Support",
+        "libLLVM70ProfileData",
     ],
 }

diff --git a/tools/llvm-extract/Android.bp b/tools/llvm-extract/Android.bp
index 7743949..7b3f93f 100644 (file)
--- a/tools/llvm-extract/Android.bp
+++ b/tools/llvm-extract/Android.bp
@@ -4,19 +4,19 @@
 
 cc_binary_host {
     name: "llvm-extract",
-    defaults: ["llvm-defaults"],
+    defaults: ["llvm70-defaults"],
     srcs: ["llvm-extract.cpp"],
     static_libs: [
-        "libLLVMIRReader",
-        "libLLVMAsmParser",
-        "libLLVMObject",
-        "libLLVMBitReader",
-        "libLLVMBitWriter",
-        "libLLVMipo",
-        "libLLVMTransformUtils",
-        "libLLVMAnalysis",
-        "libLLVMTarget",
-        "libLLVMCore",
-        "libLLVMSupport",
+        "libLLVM70IRReader",
+        "libLLVM70AsmParser",
+        "libLLVM70Object",
+        "libLLVM70BitReader",
+        "libLLVM70BitWriter",
+        "libLLVM70ipo",
+        "libLLVM70TransformUtils",
+        "libLLVM70Analysis",
+        "libLLVM70Target",
+        "libLLVM70Core",
+        "libLLVM70Support",
     ],
 }

diff --git a/tools/llvm-go/llvm-go.go b/tools/llvm-go/llvm-go.go
index 4d65de6..7a1765e 100644 (file)
--- a/tools/llvm-go/llvm-go.go
+++ b/tools/llvm-go/llvm-go.go
@@ -71,7 +71,7 @@ func llvmConfig(args ...string) string {
        configpath := os.Getenv("LLVM_CONFIG")
        if configpath == "" {
                bin, _ := filepath.Split(os.Args[0])
-               configpath = filepath.Join(bin, "llvm-config")
+               configpath = filepath.Join(bin, "llvm70-config")
        }
 
        cmd := exec.Command(configpath, args...)
@@ -131,7 +131,7 @@ func printConfig() {
 
 // This file is generated by llvm-go, do not edit.
 
-package llvm
+package llvm70
 
 /*
 #cgo CPPFLAGS: %s

diff --git a/tools/llvm-link/Android.bp b/tools/llvm-link/Android.bp
index 29b4c96..4b1738b 100644 (file)
--- a/tools/llvm-link/Android.bp
+++ b/tools/llvm-link/Android.bp
@@ -4,21 +4,21 @@
 
 cc_binary {
     name: "llvm-link",
-    defaults: ["llvm-defaults"],
+    defaults: ["llvm70-defaults"],
     srcs: ["llvm-link.cpp"],
     static_libs: [
-        "libLLVMLinker",
-        "libLLVMIRReader",
-        "libLLVMObject",
-        "libLLVMMC",
-        "libLLVMMCParser",
-        "libLLVMBitReader",
-        "libLLVMBitWriter",
-        "libLLVMAsmParser",
-        "libLLVMTransformUtils",
-        "libLLVMAnalysis",
-        "libLLVMTarget",
-        "libLLVMCore",
-        "libLLVMSupport",
+        "libLLVM70Linker",
+        "libLLVM70IRReader",
+        "libLLVM70Object",
+        "libLLVM70MC",
+        "libLLVM70MCParser",
+        "libLLVM70BitReader",
+        "libLLVM70BitWriter",
+        "libLLVM70AsmParser",
+        "libLLVM70TransformUtils",
+        "libLLVM70Analysis",
+        "libLLVM70Target",
+        "libLLVM70Core",
+        "libLLVM70Support",
     ],
 }

diff --git a/tools/llvm-lto/Android.bp b/tools/llvm-lto/Android.bp
index dd9d4e8..9c289b2 100644 (file)
--- a/tools/llvm-lto/Android.bp
+++ b/tools/llvm-lto/Android.bp
@@ -4,62 +4,62 @@
 
 cc_binary_host {
     name: "llvm-lto",
-    defaults: ["llvm-defaults"],
+    defaults: ["llvm70-defaults"],
     srcs: ["llvm-lto.cpp"],
     static_libs: [
-        "libLLVMARMCodeGen",
-        "libLLVMARMInfo",
-        "libLLVMARMDesc",
-        "libLLVMARMAsmPrinter",
-        "libLLVMARMAsmParser",
-        "libLLVMARMDisassembler",
-        "libLLVMAArch64CodeGen",
-        "libLLVMAArch64Info",
-        "libLLVMAArch64AsmParser",
-        "libLLVMAArch64AsmPrinter",
-        "libLLVMAArch64Desc",
-        "libLLVMAArch64Utils",
-        "libLLVMAArch64Disassembler",
-        "libLLVMMipsCodeGen",
-        "libLLVMMipsInfo",
-        "libLLVMMipsDesc",
-        "libLLVMMipsAsmPrinter",
-        "libLLVMMipsAsmParser",
-        "libLLVMMipsDisassembler",
-        "libLLVMX86CodeGen",
-        "libLLVMX86Info",
-        "libLLVMX86Desc",
-        "libLLVMX86AsmPrinter",
-        "libLLVMX86AsmParser",
-        "libLLVMX86Utils",
-        "libLLVMX86Disassembler",
-        "libLLVMAsmPrinter",
-        "libLLVMSelectionDAG",
-        "libLLVMLTO",
-        "libLLVMCodeGen",
-        "libLLVMGlobalISel",
-        "libLLVMDebugInfoCodeView",
-        "libLLVMTarget",
-        "libLLVMBitReader",
-        "libLLVMBitWriter",
-        "libLLVMLinker",
-        "libLLVMipo",
-        "libLLVMIRReader",
-        "libLLVMTransformObjCARC",
-        "libLLVMScalarOpts",
-        "libLLVMInstCombine",
-        "libLLVMVectorize",
-        "libLLVMInstrumentation",
-        "libLLVMTransformUtils",
-        "libLLVMProfileData",
-        "libLLVMAnalysis",
-        "libLLVMMC",
-        "libLLVMMCParser",
-        "libLLVMMCDisassembler",
-        "libLLVMObject",
-        "libLLVMCore",
-        "libLLVMAsmParser",
-        "libLLVMOption",
-        "libLLVMSupport",
+        "libLLVM70ARMCodeGen",
+        "libLLVM70ARMInfo",
+        "libLLVM70ARMDesc",
+        "libLLVM70ARMAsmPrinter",
+        "libLLVM70ARMAsmParser",
+        "libLLVM70ARMDisassembler",
+        "libLLVM70AArch64CodeGen",
+        "libLLVM70AArch64Info",
+        "libLLVM70AArch64AsmParser",
+        "libLLVM70AArch64AsmPrinter",
+        "libLLVM70AArch64Desc",
+        "libLLVM70AArch64Utils",
+        "libLLVM70AArch64Disassembler",
+        "libLLVM70MipsCodeGen",
+        "libLLVM70MipsInfo",
+        "libLLVM70MipsDesc",
+        "libLLVM70MipsAsmPrinter",
+        "libLLVM70MipsAsmParser",
+        "libLLVM70MipsDisassembler",
+        "libLLVM70X86CodeGen",
+        "libLLVM70X86Info",
+        "libLLVM70X86Desc",
+        "libLLVM70X86AsmPrinter",
+        "libLLVM70X86AsmParser",
+        "libLLVM70X86Utils",
+        "libLLVM70X86Disassembler",
+        "libLLVM70AsmPrinter",
+        "libLLVM70SelectionDAG",
+        "libLLVM70LTO",
+        "libLLVM70CodeGen",
+        "libLLVM70GlobalISel",
+        "libLLVM70DebugInfoCodeView",
+        "libLLVM70Target",
+        "libLLVM70BitReader",
+        "libLLVM70BitWriter",
+        "libLLVM70Linker",
+        "libLLVM70ipo",
+        "libLLVM70IRReader",
+        "libLLVM70TransformObjCARC",
+        "libLLVM70ScalarOpts",
+        "libLLVM70InstCombine",
+        "libLLVM70Vectorize",
+        "libLLVM70Instrumentation",
+        "libLLVM70TransformUtils",
+        "libLLVM70ProfileData",
+        "libLLVM70Analysis",
+        "libLLVM70MC",
+        "libLLVM70MCParser",
+        "libLLVM70MCDisassembler",
+        "libLLVM70Object",
+        "libLLVM70Core",
+        "libLLVM70AsmParser",
+        "libLLVM70Option",
+        "libLLVM70Support",
     ],
 }

diff --git a/tools/llvm-mc/Android.bp b/tools/llvm-mc/Android.bp
index abbdd94..885c416 100644 (file)
--- a/tools/llvm-mc/Android.bp
+++ b/tools/llvm-mc/Android.bp
@@ -4,47 +4,47 @@
 
 cc_binary_host {
     name: "llvm-mc",
-    defaults: ["llvm-defaults"],
+    defaults: ["llvm70-defaults"],
     srcs: [
         "llvm-mc.cpp",
         "Disassembler.cpp",
     ],
     static_libs: [
-        "libLLVMARMAsmParser",
-        "libLLVMARMInfo",
-        "libLLVMARMDesc",
-        "libLLVMARMAsmPrinter",
-        "libLLVMARMDisassembler",
-        "libLLVMAArch64Info",
-        "libLLVMAArch64AsmParser",
-        "libLLVMAArch64Desc",
-        "libLLVMAArch64AsmPrinter",
-        "libLLVMAArch64Utils",
-        "libLLVMAArch64Disassembler",
-        "libLLVMMipsInfo",
-        "libLLVMMipsAsmParser",
-        "libLLVMMipsDesc",
-        "libLLVMMipsAsmPrinter",
-        "libLLVMMipsDisassembler",
-        "libLLVMX86Info",
-        "libLLVMX86Desc",
-        "libLLVMX86AsmParser",
-        "libLLVMX86AsmPrinter",
-        "libLLVMX86Utils",
-        "libLLVMX86Disassembler",
-        "libLLVMX86CodeGen",
-        "libLLVMAsmPrinter",
-        "libLLVMCodeGen",
-        "libLLVMTransformUtils",
-        "libLLVMTarget",
-        "libLLVMAnalysis",
-        "libLLVMMC",
-        "libLLVMObject",
-        "libLLVMBitReader",
-        "libLLVMMCParser",
-        "libLLVMCore",
-        "libLLVMAsmParser",
-        "libLLVMSupport",
-        "libLLVMMCDisassembler",
+        "libLLVM70ARMAsmParser",
+        "libLLVM70ARMInfo",
+        "libLLVM70ARMDesc",
+        "libLLVM70ARMAsmPrinter",
+        "libLLVM70ARMDisassembler",
+        "libLLVM70AArch64Info",
+        "libLLVM70AArch64AsmParser",
+        "libLLVM70AArch64Desc",
+        "libLLVM70AArch64AsmPrinter",
+        "libLLVM70AArch64Utils",
+        "libLLVM70AArch64Disassembler",
+        "libLLVM70MipsInfo",
+        "libLLVM70MipsAsmParser",
+        "libLLVM70MipsDesc",
+        "libLLVM70MipsAsmPrinter",
+        "libLLVM70MipsDisassembler",
+        "libLLVM70X86Info",
+        "libLLVM70X86Desc",
+        "libLLVM70X86AsmParser",
+        "libLLVM70X86AsmPrinter",
+        "libLLVM70X86Utils",
+        "libLLVM70X86Disassembler",
+        "libLLVM70X86CodeGen",
+        "libLLVM70AsmPrinter",
+        "libLLVM70CodeGen",
+        "libLLVM70TransformUtils",
+        "libLLVM70Target",
+        "libLLVM70Analysis",
+        "libLLVM70MC",
+        "libLLVM70Object",
+        "libLLVM70BitReader",
+        "libLLVM70MCParser",
+        "libLLVM70Core",
+        "libLLVM70AsmParser",
+        "libLLVM70Support",
+        "libLLVM70MCDisassembler",
     ],
 }

diff --git a/tools/llvm-mcmarkup/Android.bp b/tools/llvm-mcmarkup/Android.bp
index 168bae7..f93b19b 100644 (file)
--- a/tools/llvm-mcmarkup/Android.bp
+++ b/tools/llvm-mcmarkup/Android.bp
@@ -4,10 +4,10 @@
 
 cc_binary_host {
     name: "llvm-mcmarkup",
-    defaults: ["llvm-defaults"],
+    defaults: ["llvm70-defaults"],
     srcs: ["llvm-mcmarkup.cpp"],
     static_libs: [
-        "libLLVMCore",
-        "libLLVMSupport",
+        "libLLVM70Core",
+        "libLLVM70Support",
     ],
 }

diff --git a/tools/llvm-nm/Android.bp b/tools/llvm-nm/Android.bp
index d092530..dd8a851 100644 (file)
--- a/tools/llvm-nm/Android.bp
+++ b/tools/llvm-nm/Android.bp
@@ -4,45 +4,45 @@
 
 cc_binary_host {
     name: "llvm-nm",
-    defaults: ["llvm-defaults"],
+    defaults: ["llvm70-defaults"],
     srcs: ["llvm-nm.cpp"],
     static_libs: [
-        "libLLVMARMCodeGen",
-        "libLLVMARMInfo",
-        "libLLVMARMDesc",
-        "libLLVMARMAsmPrinter",
-        "libLLVMARMAsmParser",
-        "libLLVMARMDisassembler",
-        "libLLVMAArch64CodeGen",
-        "libLLVMAArch64Info",
-        "libLLVMAArch64AsmParser",
-        "libLLVMAArch64Desc",
-        "libLLVMAArch64AsmPrinter",
-        "libLLVMAArch64Utils",
-        "libLLVMAArch64Disassembler",
-        "libLLVMMipsCodeGen",
-        "libLLVMMipsInfo",
-        "libLLVMMipsAsmParser",
-        "libLLVMMipsDesc",
-        "libLLVMMipsAsmPrinter",
-        "libLLVMMipsDisassembler",
-        "libLLVMX86Info",
-        "libLLVMX86Desc",
-        "libLLVMX86AsmPrinter",
-        "libLLVMX86AsmParser",
-        "libLLVMX86CodeGen",
-        "libLLVMX86Utils",
-        "libLLVMX86Disassembler",
-        "libLLVMCodeGen",
-        "libLLVMTransformUtils",
-        "libLLVMTarget",
-        "libLLVMAnalysis",
-        "libLLVMObject",
-        "libLLVMBitReader",
-        "libLLVMMC",
-        "libLLVMMCParser",
-        "libLLVMCore",
-        "libLLVMSupport",
-        "libLLVMMCDisassembler",
+        "libLLVM70ARMCodeGen",
+        "libLLVM70ARMInfo",
+        "libLLVM70ARMDesc",
+        "libLLVM70ARMAsmPrinter",
+        "libLLVM70ARMAsmParser",
+        "libLLVM70ARMDisassembler",
+        "libLLVM70AArch64CodeGen",
+        "libLLVM70AArch64Info",
+        "libLLVM70AArch64AsmParser",
+        "libLLVM70AArch64Desc",
+        "libLLVM70AArch64AsmPrinter",
+        "libLLVM70AArch64Utils",
+        "libLLVM70AArch64Disassembler",
+        "libLLVM70MipsCodeGen",
+        "libLLVM70MipsInfo",
+        "libLLVM70MipsAsmParser",
+        "libLLVM70MipsDesc",
+        "libLLVM70MipsAsmPrinter",
+        "libLLVM70MipsDisassembler",
+        "libLLVM70X86Info",
+        "libLLVM70X86Desc",
+        "libLLVM70X86AsmPrinter",
+        "libLLVM70X86AsmParser",
+        "libLLVM70X86CodeGen",
+        "libLLVM70X86Utils",
+        "libLLVM70X86Disassembler",
+        "libLLVM70CodeGen",
+        "libLLVM70TransformUtils",
+        "libLLVM70Target",
+        "libLLVM70Analysis",
+        "libLLVM70Object",
+        "libLLVM70BitReader",
+        "libLLVM70MC",
+        "libLLVM70MCParser",
+        "libLLVM70Core",
+        "libLLVM70Support",
+        "libLLVM70MCDisassembler",
     ],
 }

diff --git a/tools/llvm-objdump/Android.bp b/tools/llvm-objdump/Android.bp
index 46823d9..11f4b49 100644 (file)
--- a/tools/llvm-objdump/Android.bp
+++ b/tools/llvm-objdump/Android.bp
@@ -4,7 +4,7 @@
 
 cc_binary_host {
     name: "llvm-objdump",
-    defaults: ["llvm-defaults"],
+    defaults: ["llvm70-defaults"],
     srcs: [
         "llvm-objdump.cpp",
         "COFFDump.cpp",
@@ -12,44 +12,44 @@ cc_binary_host {
         "MachODump.cpp",
     ],
     static_libs: [
-        "libLLVMDebugInfoDWARF",
-        "libLLVMDebugInfoPDB",
-        "libLLVMARMAsmParser",
-        "libLLVMARMInfo",
-        "libLLVMARMDesc",
-        "libLLVMARMAsmPrinter",
-        "libLLVMARMDisassembler",
-        "libLLVMAArch64Info",
-        "libLLVMAArch64AsmParser",
-        "libLLVMAArch64Desc",
-        "libLLVMAArch64AsmPrinter",
-        "libLLVMAArch64Utils",
-        "libLLVMAArch64Disassembler",
-        "libLLVMMipsInfo",
-        "libLLVMMipsAsmParser",
-        "libLLVMMipsDesc",
-        "libLLVMMipsAsmPrinter",
-        "libLLVMMipsDisassembler",
-        "libLLVMX86Info",
-        "libLLVMX86Desc",
-        "libLLVMX86AsmParser",
-        "libLLVMX86CodeGen",
-        "libLLVMX86AsmPrinter",
-        "libLLVMX86Utils",
-        "libLLVMX86Disassembler",
-        "libLLVMAsmPrinter",
-        "libLLVMCodeGen",
-        "libLLVMTransformUtils",
-        "libLLVMTarget",
-        "libLLVMAnalysis",
-        "libLLVMObject",
-        "libLLVMMCParser",
-        "libLLVMMC",
-        "libLLVMMCDisassembler",
-        "libLLVMBitReader",
-        "libLLVMCore",
-        "libLLVMAsmParser",
-        "libLLVMSupport",
+        "libLLVM70DebugInfoDWARF",
+        "libLLVM70DebugInfoPDB",
+        "libLLVM70ARMAsmParser",
+        "libLLVM70ARMInfo",
+        "libLLVM70ARMDesc",
+        "libLLVM70ARMAsmPrinter",
+        "libLLVM70ARMDisassembler",
+        "libLLVM70AArch64Info",
+        "libLLVM70AArch64AsmParser",
+        "libLLVM70AArch64Desc",
+        "libLLVM70AArch64AsmPrinter",
+        "libLLVM70AArch64Utils",
+        "libLLVM70AArch64Disassembler",
+        "libLLVM70MipsInfo",
+        "libLLVM70MipsAsmParser",
+        "libLLVM70MipsDesc",
+        "libLLVM70MipsAsmPrinter",
+        "libLLVM70MipsDisassembler",
+        "libLLVM70X86Info",
+        "libLLVM70X86Desc",
+        "libLLVM70X86AsmParser",
+        "libLLVM70X86CodeGen",
+        "libLLVM70X86AsmPrinter",
+        "libLLVM70X86Utils",
+        "libLLVM70X86Disassembler",
+        "libLLVM70AsmPrinter",
+        "libLLVM70CodeGen",
+        "libLLVM70TransformUtils",
+        "libLLVM70Target",
+        "libLLVM70Analysis",
+        "libLLVM70Object",
+        "libLLVM70MCParser",
+        "libLLVM70MC",
+        "libLLVM70MCDisassembler",
+        "libLLVM70BitReader",
+        "libLLVM70Core",
+        "libLLVM70AsmParser",
+        "libLLVM70Support",
     ],
 
     // b/31938382, clang-tidy segmentation fault on MachODump.cpp.

diff --git a/tools/llvm-pdbdump/Android.bp b/tools/llvm-pdbdump/Android.bp
index 2cf9bb5..71385ca 100644 (file)
--- a/tools/llvm-pdbdump/Android.bp
+++ b/tools/llvm-pdbdump/Android.bp
@@ -1,10 +1,10 @@
 cc_binary_host {
     name: "llvm-pdbdump",
-    defaults: ["llvm-defaults"],
+    defaults: ["llvm70-defaults"],
     srcs: ["*.cpp"],
     static_libs: [
-        "libLLVMDebugInfoPDB",
-        "libLLVMDebugInfoCodeView",
-        "libLLVMSupport",
+        "libLLVM70DebugInfoPDB",
+        "libLLVM70DebugInfoCodeView",
+        "libLLVM70Support",
     ],
 }

diff --git a/tools/llvm-profdata/Android.bp b/tools/llvm-profdata/Android.bp
index 6d45002..674feb2 100644 (file)
--- a/tools/llvm-profdata/Android.bp
+++ b/tools/llvm-profdata/Android.bp
@@ -4,12 +4,12 @@
 
 cc_binary_host {
     name: "llvm-profdata",
-    defaults: ["llvm-defaults"],
+    defaults: ["llvm70-defaults"],
     srcs: ["llvm-profdata.cpp"],
     static_libs: [
-        "libLLVMObject",
-        "libLLVMProfileData",
-        "libLLVMCore",
-        "libLLVMSupport",
+        "libLLVM70Object",
+        "libLLVM70ProfileData",
+        "libLLVM70Core",
+        "libLLVM70Support",
     ],
 }

diff --git a/tools/llvm-readobj/Android.bp b/tools/llvm-readobj/Android.bp
index e5494ca..7b8aef2 100644 (file)
--- a/tools/llvm-readobj/Android.bp
+++ b/tools/llvm-readobj/Android.bp
@@ -4,19 +4,19 @@
 
 cc_binary_host {
     name: "llvm-readobj",
-    defaults: ["llvm-defaults"],
+    defaults: ["llvm70-defaults"],
     srcs: ["*.cpp"],
     static_libs: [
-        "libLLVMARMInfo",
-        "libLLVMAArch64Info",
-        "libLLVMMipsInfo",
-        "libLLVMX86Info",
-        "libLLVMDebugInfoCodeView",
-        "libLLVMObject",
-        "libLLVMBitReader",
-        "libLLVMMC",
-        "libLLVMMCParser",
-        "libLLVMCore",
-        "libLLVMSupport",
+        "libLLVM70ARMInfo",
+        "libLLVM70AArch64Info",
+        "libLLVM70MipsInfo",
+        "libLLVM70X86Info",
+        "libLLVM70DebugInfoCodeView",
+        "libLLVM70Object",
+        "libLLVM70BitReader",
+        "libLLVM70MC",
+        "libLLVM70MCParser",
+        "libLLVM70Core",
+        "libLLVM70Support",
     ],
 }

diff --git a/tools/llvm-rtdyld/Android.bp b/tools/llvm-rtdyld/Android.bp
index 08fc9c0..d3493fb 100644 (file)
--- a/tools/llvm-rtdyld/Android.bp
+++ b/tools/llvm-rtdyld/Android.bp
@@ -4,46 +4,46 @@
 
 cc_binary_host {
     name: "llvm-rtdyld",
-    defaults: ["llvm-defaults"],
+    defaults: ["llvm70-defaults"],
     srcs: ["llvm-rtdyld.cpp"],
     static_libs: [
-        "libLLVMARMCodeGen",
-        "libLLVMARMInfo",
-        "libLLVMARMDesc",
-        "libLLVMARMAsmPrinter",
-        "libLLVMARMAsmParser",
-        "libLLVMARMDisassembler",
-        "libLLVMAArch64CodeGen",
-        "libLLVMAArch64Info",
-        "libLLVMAArch64AsmParser",
-        "libLLVMAArch64Desc",
-        "libLLVMAArch64AsmPrinter",
-        "libLLVMAArch64Utils",
-        "libLLVMAArch64Disassembler",
-        "libLLVMMipsCodeGen",
-        "libLLVMMipsInfo",
-        "libLLVMMipsDesc",
-        "libLLVMMipsAsmPrinter",
-        "libLLVMMipsAsmParser",
-        "libLLVMMipsDisassembler",
-        "libLLVMX86CodeGen",
-        "libLLVMX86Info",
-        "libLLVMX86Desc",
-        "libLLVMX86AsmPrinter",
-        "libLLVMX86AsmParser",
-        "libLLVMX86Utils",
-        "libLLVMX86Disassembler",
-        "libLLVMDebugInfoDWARF",
-        "libLLVMDebugInfoPDB",
-        "libLLVMExecutionEngine",
-        "libLLVMCodeGen",
-        "libLLVMObject",
-        "libLLVMMC",
-        "libLLVMMCParser",
-        "libLLVMRuntimeDyld",
-        "libLLVMBitReader",
-        "libLLVMCore",
-        "libLLVMSupport",
-        "libLLVMMCDisassembler",
+        "libLLVM70ARMCodeGen",
+        "libLLVM70ARMInfo",
+        "libLLVM70ARMDesc",
+        "libLLVM70ARMAsmPrinter",
+        "libLLVM70ARMAsmParser",
+        "libLLVM70ARMDisassembler",
+        "libLLVM70AArch64CodeGen",
+        "libLLVM70AArch64Info",
+        "libLLVM70AArch64AsmParser",
+        "libLLVM70AArch64Desc",
+        "libLLVM70AArch64AsmPrinter",
+        "libLLVM70AArch64Utils",
+        "libLLVM70AArch64Disassembler",
+        "libLLVM70MipsCodeGen",
+        "libLLVM70MipsInfo",
+        "libLLVM70MipsDesc",
+        "libLLVM70MipsAsmPrinter",
+        "libLLVM70MipsAsmParser",
+        "libLLVM70MipsDisassembler",
+        "libLLVM70X86CodeGen",
+        "libLLVM70X86Info",
+        "libLLVM70X86Desc",
+        "libLLVM70X86AsmPrinter",
+        "libLLVM70X86AsmParser",
+        "libLLVM70X86Utils",
+        "libLLVM70X86Disassembler",
+        "libLLVM70DebugInfoDWARF",
+        "libLLVM70DebugInfoPDB",
+        "libLLVM70ExecutionEngine",
+        "libLLVM70CodeGen",
+        "libLLVM70Object",
+        "libLLVM70MC",
+        "libLLVM70MCParser",
+        "libLLVM70RuntimeDyld",
+        "libLLVM70BitReader",
+        "libLLVM70Core",
+        "libLLVM70Support",
+        "libLLVM70MCDisassembler",
     ],
 }

diff --git a/tools/llvm-size/Android.bp b/tools/llvm-size/Android.bp
index d929ce5..da21793 100644 (file)
--- a/tools/llvm-size/Android.bp
+++ b/tools/llvm-size/Android.bp
@@ -4,14 +4,14 @@
 
 cc_binary_host {
     name: "llvm-size",
-    defaults: ["llvm-defaults"],
+    defaults: ["llvm70-defaults"],
     srcs: ["llvm-size.cpp"],
     static_libs: [
-        "libLLVMObject",
-        "libLLVMMC",
-        "libLLVMMCParser",
-        "libLLVMBitReader",
-        "libLLVMCore",
-        "libLLVMSupport",
+        "libLLVM70Object",
+        "libLLVM70MC",
+        "libLLVM70MCParser",
+        "libLLVM70BitReader",
+        "libLLVM70Core",
+        "libLLVM70Support",
     ],
 }

diff --git a/tools/llvm-split/Android.bp b/tools/llvm-split/Android.bp
index 8ae519c..1f35264 100644 (file)
--- a/tools/llvm-split/Android.bp
+++ b/tools/llvm-split/Android.bp
@@ -1,15 +1,15 @@
 cc_binary_host {
     name: "llvm-split",
-    defaults: ["llvm-defaults"],
+    defaults: ["llvm70-defaults"],
     srcs: ["llvm-split.cpp"],
     static_libs: [
-        "libLLVMIRReader",
-        "libLLVMBitReader",
-        "libLLVMBitWriter",
-        "libLLVMTransformUtils",
-        "libLLVMAnalysis",
-        "libLLVMCore",
-        "libLLVMAsmParser",
-        "libLLVMSupport",
+        "libLLVM70IRReader",
+        "libLLVM70BitReader",
+        "libLLVM70BitWriter",
+        "libLLVM70TransformUtils",
+        "libLLVM70Analysis",
+        "libLLVM70Core",
+        "libLLVM70AsmParser",
+        "libLLVM70Support",
     ],
 }

diff --git a/tools/llvm-symbolizer/Android.bp b/tools/llvm-symbolizer/Android.bp
index c5a1c1b..99b715d 100644 (file)
--- a/tools/llvm-symbolizer/Android.bp
+++ b/tools/llvm-symbolizer/Android.bp
@@ -1,24 +1,24 @@
 cc_binary {
     name: "llvm-symbolizer",
-    defaults: ["llvm-defaults"],
+    defaults: ["llvm70-defaults"],
     srcs:  ["llvm-symbolizer.cpp"],
     target: {
         host: {
             static_libs: [
-                "libLLVMSymbolize",
-                "libLLVMDebugInfoDWARF",
-                "libLLVMDebugInfoPDB",
-                "libLLVMDebugInfoCodeView",
-                "libLLVMObject",
-                "libLLVMBitReader",
-                "libLLVMMC",
-                "libLLVMMCParser",
-                "libLLVMCore",
-                "libLLVMSupport",
+                "libLLVM70Symbolize",
+                "libLLVM70DebugInfoDWARF",
+                "libLLVM70DebugInfoPDB",
+                "libLLVM70DebugInfoCodeView",
+                "libLLVM70Object",
+                "libLLVM70BitReader",
+                "libLLVM70MC",
+                "libLLVM70MCParser",
+                "libLLVM70Core",
+                "libLLVM70Support",
             ],
         },
         android: {
-            shared_libs: ["libLLVM"],
+            shared_libs: ["libLLVM70"],
         },
     },
 }

diff --git a/tools/lto/Android.bp b/tools/lto/Android.bp
index d9a78fe..fd38f7f 100644 (file)
--- a/tools/lto/Android.bp
+++ b/tools/lto/Android.bp
@@ -19,72 +19,72 @@
 
 cc_library_host_shared {
     name: "libLTO",
-    defaults: ["llvm-defaults"],
+    defaults: ["llvm70-defaults"],
     srcs: [
         "lto.cpp",
         "LTODisassembler.cpp",
     ],
     group_static_libs: true,
     static_libs: [
-        "libLLVMLinker",
-        "libLLVMipo",
-        "libLLVMDebugInfoDWARF",
-        "libLLVMDebugInfoPDB",
-        "libLLVMIRReader",
-        "libLLVMBitWriter",
-        "libLLVMBitReader",
-        "libLLVMARMCodeGen",
-        "libLLVMARMAsmParser",
-        "libLLVMARMAsmPrinter",
-        "libLLVMDebugInfoCodeView",
-        "libLLVMARMInfo",
-        "libLLVMARMDesc",
-        "libLLVMARMDisassembler",
-        "libLLVMMipsCodeGen",
-        "libLLVMMipsInfo",
-        "libLLVMMipsDesc",
-        "libLLVMMipsAsmParser",
-        "libLLVMMipsAsmPrinter",
-        "libLLVMMipsDisassembler",
-        "libLLVMX86CodeGen",
-        "libLLVMX86Info",
-        "libLLVMX86Desc",
-        "libLLVMX86AsmParser",
-        "libLLVMX86AsmPrinter",
-        "libLLVMX86Utils",
-        "libLLVMX86Disassembler",
-        "libLLVMAArch64CodeGen",
-        "libLLVMAArch64Info",
-        "libLLVMAArch64Desc",
-        "libLLVMAArch64AsmParser",
-        "libLLVMAArch64AsmPrinter",
-        "libLLVMAArch64Utils",
-        "libLLVMAArch64Disassembler",
-        "libLLVMExecutionEngine",
-        "libLLVMRuntimeDyld",
-        "libLLVMMCJIT",
-        "libLLVMOrcJIT",
-        "libLLVMGlobalISel",
-        "libLLVMAsmPrinter",
-        "libLLVMSelectionDAG",
-        "libLLVMCodeGen",
-        "libLLVMObject",
-        "libLLVMScalarOpts",
-        "libLLVMInstCombine",
-        "libLLVMInstrumentation",
-        "libLLVMTransformObjCARC",
-        "libLLVMTransformUtils",
-        "libLLVMVectorize",
-        "libLLVMAnalysis",
-        "libLLVMTarget",
-        "libLLVMMCDisassembler",
-        "libLLVMMC",
-        "libLLVMMCParser",
-        "libLLVMCore",
-        "libLLVMAsmParser",
-        "libLLVMOption",
-        "libLLVMLTO",
-        "libLLVMSupport",
-        "libLLVMProfileData",
+        "libLLVM70Linker",
+        "libLLVM70ipo",
+        "libLLVM70DebugInfoDWARF",
+        "libLLVM70DebugInfoPDB",
+        "libLLVM70IRReader",
+        "libLLVM70BitWriter",
+        "libLLVM70BitReader",
+        "libLLVM70ARMCodeGen",
+        "libLLVM70ARMAsmParser",
+        "libLLVM70ARMAsmPrinter",
+        "libLLVM70DebugInfoCodeView",
+        "libLLVM70ARMInfo",
+        "libLLVM70ARMDesc",
+        "libLLVM70ARMDisassembler",
+        "libLLVM70MipsCodeGen",
+        "libLLVM70MipsInfo",
+        "libLLVM70MipsDesc",
+        "libLLVM70MipsAsmParser",
+        "libLLVM70MipsAsmPrinter",
+        "libLLVM70MipsDisassembler",
+        "libLLVM70X86CodeGen",
+        "libLLVM70X86Info",
+        "libLLVM70X86Desc",
+        "libLLVM70X86AsmParser",
+        "libLLVM70X86AsmPrinter",
+        "libLLVM70X86Utils",
+        "libLLVM70X86Disassembler",
+        "libLLVM70AArch64CodeGen",
+        "libLLVM70AArch64Info",
+        "libLLVM70AArch64Desc",
+        "libLLVM70AArch64AsmParser",
+        "libLLVM70AArch64AsmPrinter",
+        "libLLVM70AArch64Utils",
+        "libLLVM70AArch64Disassembler",
+        "libLLVM70ExecutionEngine",
+        "libLLVM70RuntimeDyld",
+        "libLLVM70MCJIT",
+        "libLLVM70OrcJIT",
+        "libLLVM70GlobalISel",
+        "libLLVM70AsmPrinter",
+        "libLLVM70SelectionDAG",
+        "libLLVM70CodeGen",
+        "libLLVM70Object",
+        "libLLVM70ScalarOpts",
+        "libLLVM70InstCombine",
+        "libLLVM70Instrumentation",
+        "libLLVM70TransformObjCARC",
+        "libLLVM70TransformUtils",
+        "libLLVM70Vectorize",
+        "libLLVM70Analysis",
+        "libLLVM70Target",
+        "libLLVM70MCDisassembler",
+        "libLLVM70MC",
+        "libLLVM70MCParser",
+        "libLLVM70Core",
+        "libLLVM70AsmParser",
+        "libLLVM70Option",
+        "libLLVM70LTO",
+        "libLLVM70Support",
+        "libLLVM70ProfileData",
     ],
 }

diff --git a/tools/obj2yaml/Android.bp b/tools/obj2yaml/Android.bp
index dbd9d63..e571b25 100644 (file)
--- a/tools/obj2yaml/Android.bp
+++ b/tools/obj2yaml/Android.bp
@@ -4,15 +4,15 @@
 
 cc_binary_host {
     name: "obj2yaml",
-    defaults: ["llvm-defaults"],
+    defaults: ["llvm70-defaults"],
     srcs: ["*.cpp"],
     static_libs: [
-        "libLLVMObject",
-        "libLLVMObjectYAML",
-        "libLLVMMC",
-        "libLLVMMCParser",
-        "libLLVMBitReader",
-        "libLLVMCore",
-        "libLLVMSupport",
+        "libLLVM70Object",
+        "libLLVM70ObjectYAML",
+        "libLLVM70MC",
+        "libLLVM70MCParser",
+        "libLLVM70BitReader",
+        "libLLVM70Core",
+        "libLLVM70Support",
     ],
 }

diff --git a/tools/opt/Android.bp b/tools/opt/Android.bp
index 499c4d4..31b479f 100644 (file)
--- a/tools/opt/Android.bp
+++ b/tools/opt/Android.bp
@@ -4,59 +4,59 @@
 
 cc_binary_host {
     name: "opt",
-    defaults: ["llvm-defaults"],
+    defaults: ["llvm70-defaults"],
     srcs: ["*.cpp"],
     static_libs: [
-        "libLLVMIRReader",
-        "libLLVMBitReader",
-        "libLLVMBitWriter",
-        "libLLVMARMCodeGen",
-        "libLLVMARMInfo",
-        "libLLVMARMDesc",
-        "libLLVMARMAsmPrinter",
-        "libLLVMARMDisassembler",
-        "libLLVMAArch64CodeGen",
-        "libLLVMAArch64Info",
-        "libLLVMAArch64Desc",
-        "libLLVMAArch64AsmPrinter",
-        "libLLVMAArch64Utils",
-        "libLLVMAArch64Disassembler",
-        "libLLVMMipsCodeGen",
-        "libLLVMMipsInfo",
-        "libLLVMMipsDesc",
-        "libLLVMMipsAsmPrinter",
-        "libLLVMMipsDisassembler",
-        "libLLVMX86CodeGen",
-        "libLLVMX86Info",
-        "libLLVMX86Desc",
-        "libLLVMX86AsmPrinter",
-        "libLLVMX86Utils",
-        "libLLVMX86Disassembler",
-        "libLLVMGlobalISel",
-        "libLLVMAsmPrinter",
-        "libLLVMDebugInfoCodeView",
-        "libLLVMSelectionDAG",
-        "libLLVMCodeGen",
-        "libLLVMTransformObjCARC",
-        "libLLVMVectorize",
-        "libLLVMScalarOpts",
-        "libLLVMPasses",
-        "libLLVMipo",
-        "libLLVMLinker",
-        "libLLVMInstCombine",
-        "libLLVMInstrumentation",
-        "libLLVMTransformUtils",
-        "libLLVMAnalysis",
-        "libLLVMTarget",
-        "libLLVMMC",
-        "libLLVMMCParser",
-        "libLLVMObject",
-        "libLLVMProfileData",
-        "libLLVMCore",
-        "libLLVMAsmParser",
-        "libLLVMOption",
-        "libLLVMSupport",
-        "libLLVMMCDisassembler",
+        "libLLVM70IRReader",
+        "libLLVM70BitReader",
+        "libLLVM70BitWriter",
+        "libLLVM70ARMCodeGen",
+        "libLLVM70ARMInfo",
+        "libLLVM70ARMDesc",
+        "libLLVM70ARMAsmPrinter",
+        "libLLVM70ARMDisassembler",
+        "libLLVM70AArch64CodeGen",
+        "libLLVM70AArch64Info",
+        "libLLVM70AArch64Desc",
+        "libLLVM70AArch64AsmPrinter",
+        "libLLVM70AArch64Utils",
+        "libLLVM70AArch64Disassembler",
+        "libLLVM70MipsCodeGen",
+        "libLLVM70MipsInfo",
+        "libLLVM70MipsDesc",
+        "libLLVM70MipsAsmPrinter",
+        "libLLVM70MipsDisassembler",
+        "libLLVM70X86CodeGen",
+        "libLLVM70X86Info",
+        "libLLVM70X86Desc",
+        "libLLVM70X86AsmPrinter",
+        "libLLVM70X86Utils",
+        "libLLVM70X86Disassembler",
+        "libLLVM70GlobalISel",
+        "libLLVM70AsmPrinter",
+        "libLLVM70DebugInfoCodeView",
+        "libLLVM70SelectionDAG",
+        "libLLVM70CodeGen",
+        "libLLVM70TransformObjCARC",
+        "libLLVM70Vectorize",
+        "libLLVM70ScalarOpts",
+        "libLLVM70Passes",
+        "libLLVM70ipo",
+        "libLLVM70Linker",
+        "libLLVM70InstCombine",
+        "libLLVM70Instrumentation",
+        "libLLVM70TransformUtils",
+        "libLLVM70Analysis",
+        "libLLVM70Target",
+        "libLLVM70MC",
+        "libLLVM70MCParser",
+        "libLLVM70Object",
+        "libLLVM70ProfileData",
+        "libLLVM70Core",
+        "libLLVM70AsmParser",
+        "libLLVM70Option",
+        "libLLVM70Support",
+        "libLLVM70MCDisassembler",
     ],
     target: {
         darwin: {

diff --git a/tools/sancov/Android.bp b/tools/sancov/Android.bp
index b6c483e..43c2ca1 100644 (file)
--- a/tools/sancov/Android.bp
+++ b/tools/sancov/Android.bp
@@ -4,60 +4,60 @@
 
 cc_binary_host {
     name: "sancov",
-    defaults: ["llvm-defaults"],
+    defaults: ["llvm70-defaults"],
     srcs: ["sancov.cc"],
     static_libs: [
-        "libLLVMIRReader",
-        "libLLVMARMCodeGen",
-        "libLLVMARMInfo",
-        "libLLVMARMDesc",
-        "libLLVMARMAsmPrinter",
-        "libLLVMARMDisassembler",
-        "libLLVMAArch64CodeGen",
-        "libLLVMAArch64Info",
-        "libLLVMAArch64Desc",
-        "libLLVMAArch64AsmPrinter",
-        "libLLVMAArch64Utils",
-        "libLLVMAArch64Disassembler",
-        "libLLVMMipsCodeGen",
-        "libLLVMMipsInfo",
-        "libLLVMMipsDesc",
-        "libLLVMMipsAsmPrinter",
-        "libLLVMMipsDisassembler",
-        "libLLVMX86CodeGen",
-        "libLLVMX86Info",
-        "libLLVMX86Desc",
-        "libLLVMX86AsmPrinter",
-        "libLLVMX86Utils",
-        "libLLVMX86Disassembler",
-        "libLLVMSymbolize",
-        "libLLVMDebugInfoDWARF",
-        "libLLVMDebugInfoPDB",
-        "libLLVMDebugInfoCodeView",
-        "libLLVMAsmPrinter",
-        "libLLVMSelectionDAG",
-        "libLLVMCodeGen",
-        "libLLVMTransformObjCARC",
-        "libLLVMVectorize",
-        "libLLVMScalarOpts",
-        "libLLVMPasses",
-        "libLLVMipo",
-        "libLLVMLinker",
-        "libLLVMInstCombine",
-        "libLLVMInstrumentation",
-        "libLLVMTransformUtils",
-        "libLLVMAnalysis",
-        "libLLVMTarget",
-        "libLLVMObject",
-        "libLLVMBitReader",
-        "libLLVMBitWriter",
-        "libLLVMMC",
-        "libLLVMMCParser",
-        "libLLVMProfileData",
-        "libLLVMCore",
-        "libLLVMAsmParser",
-        "libLLVMOption",
-        "libLLVMSupport",
-        "libLLVMMCDisassembler",
+        "libLLVM70IRReader",
+        "libLLVM70ARMCodeGen",
+        "libLLVM70ARMInfo",
+        "libLLVM70ARMDesc",
+        "libLLVM70ARMAsmPrinter",
+        "libLLVM70ARMDisassembler",
+        "libLLVM70AArch64CodeGen",
+        "libLLVM70AArch64Info",
+        "libLLVM70AArch64Desc",
+        "libLLVM70AArch64AsmPrinter",
+        "libLLVM70AArch64Utils",
+        "libLLVM70AArch64Disassembler",
+        "libLLVM70MipsCodeGen",
+        "libLLVM70MipsInfo",
+        "libLLVM70MipsDesc",
+        "libLLVM70MipsAsmPrinter",
+        "libLLVM70MipsDisassembler",
+        "libLLVM70X86CodeGen",
+        "libLLVM70X86Info",
+        "libLLVM70X86Desc",
+        "libLLVM70X86AsmPrinter",
+        "libLLVM70X86Utils",
+        "libLLVM70X86Disassembler",
+        "libLLVM70Symbolize",
+        "libLLVM70DebugInfoDWARF",
+        "libLLVM70DebugInfoPDB",
+        "libLLVM70DebugInfoCodeView",
+        "libLLVM70AsmPrinter",
+        "libLLVM70SelectionDAG",
+        "libLLVM70CodeGen",
+        "libLLVM70TransformObjCARC",
+        "libLLVM70Vectorize",
+        "libLLVM70ScalarOpts",
+        "libLLVM70Passes",
+        "libLLVM70ipo",
+        "libLLVM70Linker",
+        "libLLVM70InstCombine",
+        "libLLVM70Instrumentation",
+        "libLLVM70TransformUtils",
+        "libLLVM70Analysis",
+        "libLLVM70Target",
+        "libLLVM70Object",
+        "libLLVM70BitReader",
+        "libLLVM70BitWriter",
+        "libLLVM70MC",
+        "libLLVM70MCParser",
+        "libLLVM70ProfileData",
+        "libLLVM70Core",
+        "libLLVM70AsmParser",
+        "libLLVM70Option",
+        "libLLVM70Support",
+        "libLLVM70MCDisassembler",
     ],
 }

diff --git a/tools/sanstats/Android.bp b/tools/sanstats/Android.bp
index 0494474..f24ec62 100644 (file)
--- a/tools/sanstats/Android.bp
+++ b/tools/sanstats/Android.bp
@@ -4,18 +4,18 @@
 
 cc_binary_host {
     name: "sanstats",
-    defaults: ["llvm-defaults"],
+    defaults: ["llvm70-defaults"],
     srcs: ["sanstats.cpp"],
     static_libs: [
-        "libLLVMSymbolize",
-        "libLLVMDebugInfoDWARF",
-        "libLLVMDebugInfoPDB",
-        "libLLVMDebugInfoCodeView",
-        "libLLVMObject",
-        "libLLVMBitReader",
-        "libLLVMCore",
-        "libLLVMMCParser",
-        "libLLVMMC",
-        "libLLVMSupport",
+        "libLLVM70Symbolize",
+        "libLLVM70DebugInfoDWARF",
+        "libLLVM70DebugInfoPDB",
+        "libLLVM70DebugInfoCodeView",
+        "libLLVM70Object",
+        "libLLVM70BitReader",
+        "libLLVM70Core",
+        "libLLVM70MCParser",
+        "libLLVM70MC",
+        "libLLVM70Support",
     ],
 }

diff --git a/tools/verify-uselistorder/Android.bp b/tools/verify-uselistorder/Android.bp
index 0aace22..b1058aa 100644 (file)
--- a/tools/verify-uselistorder/Android.bp
+++ b/tools/verify-uselistorder/Android.bp
@@ -1,14 +1,14 @@
 cc_binary_host {
     name: "verify-uselistorder",
-    defaults: ["llvm-defaults"],
+    defaults: ["llvm70-defaults"],
     srcs: ["verify-uselistorder.cpp"],
     static_libs: [
-        "libLLVMAsmParser",
-        "libLLVMBitReader",
-        "libLLVMBitWriter",
-        "libLLVMAnalysis",
-        "libLLVMCore",
-        "libLLVMIRReader",
-        "libLLVMSupport",
+        "libLLVM70AsmParser",
+        "libLLVM70BitReader",
+        "libLLVM70BitWriter",
+        "libLLVM70Analysis",
+        "libLLVM70Core",
+        "libLLVM70IRReader",
+        "libLLVM70Support",
     ],
 }

diff --git a/tools/yaml2obj/Android.bp b/tools/yaml2obj/Android.bp
index d503bc1..048b812 100644 (file)
--- a/tools/yaml2obj/Android.bp
+++ b/tools/yaml2obj/Android.bp
@@ -4,15 +4,15 @@
 
 cc_binary_host {
     name: "yaml2obj",
-    defaults: ["llvm-defaults"],
+    defaults: ["llvm70-defaults"],
     srcs: ["*.cpp"],
     static_libs: [
-        "libLLVMObject",
-        "libLLVMObjectYAML",
-        "libLLVMMC",
-        "libLLVMMCParser",
-        "libLLVMBitReader",
-        "libLLVMCore",
-        "libLLVMSupport",
+        "libLLVM70Object",
+        "libLLVM70ObjectYAML",
+        "libLLVM70MC",
+        "libLLVM70MCParser",
+        "libLLVM70BitReader",
+        "libLLVM70Core",
+        "libLLVM70Support",
     ],
 }

diff --git a/utils/FileCheck/Android.bp b/utils/FileCheck/Android.bp
index e21b9de..b55cf20 100644 (file)
--- a/utils/FileCheck/Android.bp
+++ b/utils/FileCheck/Android.bp
@@ -1,8 +1,8 @@
 cc_binary_host {
     name: "FileCheck",
-    defaults: ["llvm-defaults"],
+    defaults: ["llvm70-defaults"],
     srcs: ["FileCheck.cpp"],
-    static_libs: ["libLLVMSupport"],
+    static_libs: ["libLLVM70Support"],
     cflags: [
         "-D__STDC_LIMIT_MACROS",
         "-D__STDC_CONSTANT_MACROS",

diff --git a/utils/TableGen/Android.bp b/utils/TableGen/Android.bp
index 7dc34a6..3cccf11 100644 (file)
--- a/utils/TableGen/Android.bp
+++ b/utils/TableGen/Android.bp
@@ -1,11 +1,11 @@
 cc_binary_host {
-    name: "llvm-tblgen",
-    defaults: ["llvm-defaults-no-generated-headers"],
+    name: "llvm70-tblgen",
+    defaults: ["llvm70-defaults-no-generated-headers"],
     srcs: ["*.cpp"],
 
     static_libs: [
-        "libLLVMTableGen",
-        "libLLVMSupport",
+        "libLLVM70TableGen",
+        "libLLVM70Support",
     ],
 
     host_ldlibs: ["-lm"],
@@ -13,8 +13,8 @@ cc_binary_host {
         windows: {
             enabled: false,
         },
-        // llvm-defaults turns off host builds by default, turn it back on for
-        // modules that are used to build llvm-tblgen
+        // llvm70-defaults turns off host builds by default, turn it back on for
+        // modules that are used to build llvm70-tblgen
         host: {
             enabled: true,
         },

diff --git a/utils/TableGen/tdtags b/utils/TableGen/tdtags
index 5214485..bf8668e 100644 (file)
--- a/utils/TableGen/tdtags
+++ b/utils/TableGen/tdtags
@@ -352,7 +352,7 @@ LC_ALL=C
 export LC_ALL
 
 # Globals.
-TBLGEN=llvm-tblgen
+TBLGEN=llvm70-tblgen
 LLVM_SRC_ROOT=
 
 # Command options.

diff --git a/utils/count/Android.bp b/utils/count/Android.bp
index 1d43809..0cd98b8 100644 (file)
--- a/utils/count/Android.bp
+++ b/utils/count/Android.bp
@@ -4,6 +4,6 @@
 
 cc_binary_host {
     name: "count",
-    defaults: ["llvm-defaults"],
+    defaults: ["llvm70-defaults"],
     srcs: ["count.c"],
 }

diff --git a/utils/not/Android.bp b/utils/not/Android.bp
index 25a2f83..ab28b15 100644 (file)
--- a/utils/not/Android.bp
+++ b/utils/not/Android.bp
@@ -4,10 +4,10 @@
 
 cc_binary_host {
     name: "not",
-    defaults: ["llvm-defaults"],
+    defaults: ["llvm70-defaults"],
     srcs: ["not.cpp"],
     static_libs: [
-        "libLLVMCore",
-        "libLLVMSupport",
+        "libLLVM70Core",
+        "libLLVM70Support",
     ],
 }

diff --git a/utils/yaml-bench/Android.bp b/utils/yaml-bench/Android.bp
index df5092f..80dd3aa 100644 (file)
--- a/utils/yaml-bench/Android.bp
+++ b/utils/yaml-bench/Android.bp
@@ -3,7 +3,7 @@
 
 cc_binary_host {
     name: "yaml-bench",
-    defaults: ["llvm-defaults"],
+    defaults: ["llvm70-defaults"],
     srcs: ["YAMLBench.cpp"],
-    static_libs: ["libLLVMSupport"],
+    static_libs: ["libLLVM70Support"],
 }