X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=Android.bp;h=eac4af61401e8fa63638dac6b930be17c8a6269a;hb=9811a779896af8da97378a91db70b77a1331a6ab;hp=2caeb5d710dcad09abd616bfffe3daefe190b773;hpb=9ae99a4515d961ca65fac100a39347675f13b0c1;p=android-x86%2Fexternal-llvm.git

diff --git a/Android.bp b/Android.bp
index 2caeb5d710d..eac4af61401 100644
--- 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,18 +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",
+        "llvm70-gen-attributes",
+        "llvm70-gen-intrinsics",
+        "llvm70-gen-revision",
     ],
     export_generated_headers: [
-        "llvm-gen-attributes",
-        "llvm-gen-intrinsics",
+        "llvm70-gen-attributes",
+        "llvm70-gen-intrinsics",
+        "llvm70-gen-revision",
     ],
     target: {
         windows: {
@@ -137,20 +139,31 @@ 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.gen"],
+    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/Intrinsics.gen"],
+    outs: [
+        "llvm/IR/IntrinsicEnums.inc",
+        "llvm/IR/IntrinsicImpl.inc",
+    ],
+}
+
+genrule {
+    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
 }
@@ -158,106 +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",
+        "libLLVM70Linker",
+        "libLLVM70ipo",
+        "libLLVM70DebugInfoDWARF",
+        "libLLVM70DebugInfoMSF",
+        "libLLVM70DebugInfoPDB",
+        "libLLVM70Symbolize",
+        "libLLVM70IRReader",
+        "libLLVM70BitWriter",
+        "libLLVM70BitReader",
+        "libLLVM70Passes",
+        "libLLVM70Demangle",
 
         // post static libraries
-        "libLLVMLTO",
-        "libLLVMAsmPrinter",
-        "libLLVMSelectionDAG",
-        "libLLVMCodeGen",
-        "libLLVMDebugInfoCodeView",
-        "libLLVMObject",
-        "libLLVMScalarOpts",
-        "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"],