From 97782606d1f47873d47a40a10215731860ce8e99 Mon Sep 17 00:00:00 2001
From: Mauro Rossi <issor.oruam@gmail.com>
Date: Sun, 31 Jul 2022 10:40:40 +0200
Subject: [PATCH] DO NOT MERGE: android: translate soong build rules for
 libLLVM15

Changes to side build external/llvm-project project (llvm 15 version)
and avoid conflicts with external/llvm project targets and variables
Changes in mesa main Android.mk are required for libLLVM15
shared library dependency and cflag -DMESA_LLVM_VERSION_STRING=\"15.0\"

The changelog is described by means of modules and variables
which needed to be renamed in external/llvm-project/llvm/ path:

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

 #rename the boostrap and contextual build paths
find . -type f -name "*.bp" -exec sed -i 's/soong\-llvm/\soong-llvm15/g' {} +
find . -type f -name "*.go" -exec sed -i 's/android\/soong\/llvm/android\/soong\/llvm15/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_llvm15_components/g' {} +
find . -type f -name '*.go' -exec sed -i 's/force_build_llvm_components/force_build_llvm15_components/g' {} +

 #rename all module that gave 'already defined' error
find . -type f -name '*.bp' -exec sed -i 's/llvm-aarch64-defaults/llvm15-aarch64-defaults/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/llvm-aarch64-headers/llvm15-aarch64-headers/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/llvm-amdgpu-defaults/llvm15-amdgpu-defaults/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/llvm-amdgpu-headers/llvm15-amdgpu-headers/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/llvm-arm-defaults/llvm15-arm-defaults/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/llvm-arm-headers/llvm15-arm-headers/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/llvm-defaults/llvm15-defaults/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/llvm-defaults-no-generated-headers/llvm15-defaults-no-generated-headers/g' {} +
 #note the following line replaced all llvm-gen-* entries of the previous versions
find . -type f -name '*.bp' -exec sed -i 's/llvm-gen-/llvm15-gen-/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/llvm-headers/llvm15-headers/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/llvm-headers-no-generated-headers/llvm15-headers-no-generated-headers/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/llvm-lib-defaults/llvm15-lib-defaults/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/llvm-mips-defaults/llvm15-mips-defaults/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/llvm-mips-headers/llvm15-mips-headers/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/llvm-tblgen/llvm15-tblgen/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/llvm-x86-defaults/llvm15-x86-defaults/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/llvm-x86-headers/llvm15-x86-headers/g' {} +

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

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

 #rename the TableGen binary module and variable in different files
find . -type f -name '*.go' -exec sed -i 's/LLVM TableGen/LLVM15 TableGen/g' {} +
find . -type f -name '*.go' -exec sed -i 's/llvm-tblgen/llvm15-tblgen/g' {} +
find . -type f -name '*.go' -exec sed -i 's/llvmTblgen/llvm15Tblgen/g' {} +
find . -type f -name '*.go' -exec sed -i 's/tblgenRule/tblgenRule15/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/llvm_tblgen/llvm15_tblgen/g' {} +
find . -type f -name '*.go' -exec sed -i 's/llvm_tblgen/llvm15_tblgen/g' {} +
find . -type f -name 'tdtags' -exec sed -i 's/llvm-tblgen/llvm15-tblgen/g' {} +

 #COMMENTED AS NOT NEEDED in external/llvm-project (was: rename the include paths)
 #find . -type f -name '*.bp' -exec sed -i 's/external\/llvm/external\/llvm15/g' {} +
 #find . -type f -name '*.go' -exec sed -i 's/external\/llvm/external\/llvm15/g' {} +

 #rename package, registered types and llvm-config
find . -type f -name '*.go' -exec sed -i 's/package llvm/package llvm15/g' {} +
find . -type f -name '*.go' -exec sed -i 's/llvm_tblgen/llvm15_tblgen/g' {} +
find . -type f -name '*.go' -exec sed -i 's/llvm_defaults/llvm15_defaults/g' {} +
find . -type f -name '*.bp' -exec sed -i 's/ llvm-config / llvm15-config /g' {} +
find . -type f -name '*.bp' -exec sed -i 's/"llvm-config"/"llvm15-config"/g' {} +
find . -type f -name '*.go' -exec sed -i 's/"llvm-config"/"llvm15-config"/g' {} +
---
 llvm/Android.bp                               | 250 +++++++++---------
 llvm/bindings/go/llvm/analysis.go             |   2 +-
 llvm/bindings/go/llvm/bitreader.go            |   2 +-
 llvm/bindings/go/llvm/bitwriter.go            |   2 +-
 llvm/bindings/go/llvm/dibuilder.go            |   2 +-
 llvm/bindings/go/llvm/executionengine.go      |   2 +-
 llvm/bindings/go/llvm/executionengine_test.go |   2 +-
 llvm/bindings/go/llvm/ir.go                   |   2 +-
 llvm/bindings/go/llvm/ir_test.go              |   2 +-
 llvm/bindings/go/llvm/linker.go               |   2 +-
 llvm/bindings/go/llvm/llvm_dep.go             |   2 +-
 llvm/bindings/go/llvm/string.go               |   2 +-
 llvm/bindings/go/llvm/string_test.go          |   2 +-
 llvm/bindings/go/llvm/support.go              |   2 +-
 llvm/bindings/go/llvm/target.go               |   2 +-
 .../go/llvm/transforms_instrumentation.go     |   2 +-
 llvm/bindings/go/llvm/transforms_ipo.go       |   2 +-
 llvm/bindings/go/llvm/transforms_pmbuilder.go |   2 +-
 llvm/bindings/go/llvm/transforms_scalar.go    |   2 +-
 llvm/bindings/go/llvm/version.go              |   2 +-
 llvm/lib/Analysis/Android.bp                  |   4 +-
 llvm/lib/Android.bp                           |   6 +-
 llvm/lib/AsmParser/Android.bp                 |   4 +-
 llvm/lib/BinaryFormat/Android.bp              |   4 +-
 llvm/lib/Bitcode/Reader/Android.bp            |   4 +-
 llvm/lib/Bitcode/Writer/Android.bp            |   4 +-
 llvm/lib/Bitstream/Reader/Android.bp          |   4 +-
 llvm/lib/CodeGen/Android.bp                   |   4 +-
 llvm/lib/CodeGen/AsmPrinter/Android.bp        |   4 +-
 llvm/lib/CodeGen/GlobalISel/Android.bp        |   4 +-
 llvm/lib/CodeGen/MIRParser/Android.bp         |   4 +-
 llvm/lib/CodeGen/SelectionDAG/Android.bp      |   4 +-
 llvm/lib/DebugInfo/CodeView/Android.bp        |   4 +-
 llvm/lib/DebugInfo/DWARF/Android.bp           |   4 +-
 llvm/lib/DebugInfo/MSF/Android.bp             |   4 +-
 llvm/lib/DebugInfo/PDB/Android.bp             |   4 +-
 llvm/lib/DebugInfo/Symbolize/Android.bp       |   4 +-
 llvm/lib/Debuginfod/Android.bp                |   4 +-
 llvm/lib/Demangle/Android.bp                  |   4 +-
 llvm/lib/ExecutionEngine/Android.bp           |   4 +-
 .../ExecutionEngine/Interpreter/Android.bp    |   4 +-
 llvm/lib/ExecutionEngine/JITLink/Android.bp   |   4 +-
 llvm/lib/ExecutionEngine/MCJIT/Android.bp     |   4 +-
 llvm/lib/ExecutionEngine/Orc/Android.bp       |   4 +-
 .../lib/ExecutionEngine/Orc/Shared/Android.bp |   4 +-
 .../Orc/TargetProcess/Android.bp              |   4 +-
 .../ExecutionEngine/RuntimeDyld/Android.bp    |   4 +-
 llvm/lib/Frontend/OpenACC/Android.bp          |   6 +-
 llvm/lib/Frontend/OpenMP/Android.bp           |   6 +-
 llvm/lib/IR/Android.bp                        |   4 +-
 llvm/lib/IRReader/Android.bp                  |   4 +-
 llvm/lib/InterfaceStub/Android.bp             |   4 +-
 llvm/lib/LTO/Android.bp                       |   4 +-
 llvm/lib/Linker/Android.bp                    |   4 +-
 llvm/lib/MC/Android.bp                        |   4 +-
 llvm/lib/MC/MCDisassembler/Android.bp         |   4 +-
 llvm/lib/MC/MCParser/Android.bp               |   4 +-
 llvm/lib/Object/Android.bp                    |   4 +-
 llvm/lib/ObjectYAML/Android.bp                |   4 +-
 llvm/lib/Option/Android.bp                    |   4 +-
 llvm/lib/Passes/Android.bp                    |   4 +-
 llvm/lib/ProfileData/Android.bp               |   4 +-
 llvm/lib/ProfileData/Coverage/Android.bp      |   4 +-
 llvm/lib/Remarks/Android.bp                   |   4 +-
 llvm/lib/Support/Android.bp                   |   8 +-
 llvm/lib/TableGen/Android.bp                  |   8 +-
 llvm/lib/Target/AArch64/Android.bp            |  18 +-
 llvm/lib/Target/AArch64/AsmParser/Android.bp  |   6 +-
 .../Target/AArch64/Disassembler/Android.bp    |   6 +-
 .../lib/Target/AArch64/InstPrinter/Android.bp |   6 +-
 .../Target/AArch64/MCTargetDesc/Android.bp    |   6 +-
 llvm/lib/Target/AArch64/TargetInfo/Android.bp |   6 +-
 llvm/lib/Target/AArch64/Utils/Android.bp      |   6 +-
 llvm/lib/Target/AMDGPU/Android.bp             |  36 +--
 llvm/lib/Target/AMDGPU/AsmParser/Android.bp   |   6 +-
 .../lib/Target/AMDGPU/Disassembler/Android.bp |   6 +-
 llvm/lib/Target/AMDGPU/InstPrinter/Android.bp |   6 +-
 .../lib/Target/AMDGPU/MCTargetDesc/Android.bp |   6 +-
 llvm/lib/Target/AMDGPU/TargetInfo/Android.bp  |   6 +-
 llvm/lib/Target/AMDGPU/Utils/Android.bp       |   6 +-
 llvm/lib/Target/ARM/Android.bp                |  18 +-
 llvm/lib/Target/ARM/AsmParser/Android.bp      |   6 +-
 llvm/lib/Target/ARM/Disassembler/Android.bp   |   6 +-
 llvm/lib/Target/ARM/InstPrinter/Android.bp    |   6 +-
 llvm/lib/Target/ARM/MCTargetDesc/Android.bp   |   6 +-
 llvm/lib/Target/ARM/TargetInfo/Android.bp     |   6 +-
 llvm/lib/Target/ARM/Utils/Android.bp          |   6 +-
 llvm/lib/Target/Android.bp                    |   4 +-
 llvm/lib/Target/Mips/Android.bp               |  18 +-
 llvm/lib/Target/Mips/AsmParser/Android.bp     |   6 +-
 llvm/lib/Target/Mips/Disassembler/Android.bp  |   6 +-
 llvm/lib/Target/Mips/InstPrinter/Android.bp   |   6 +-
 llvm/lib/Target/Mips/MCTargetDesc/Android.bp  |   6 +-
 llvm/lib/Target/Mips/TargetInfo/Android.bp    |   6 +-
 llvm/lib/Target/X86/Android.bp                |  18 +-
 llvm/lib/Target/X86/AsmParser/Android.bp      |   6 +-
 llvm/lib/Target/X86/Disassembler/Android.bp   |   6 +-
 llvm/lib/Target/X86/InstPrinter/Android.bp    |   6 +-
 llvm/lib/Target/X86/MCTargetDesc/Android.bp   |   6 +-
 llvm/lib/Target/X86/TargetInfo/Android.bp     |   6 +-
 llvm/lib/Target/X86/Utils/Android.bp          |   6 +-
 llvm/lib/TextAPI/Android.bp                   |   4 +-
 llvm/lib/ToolDrivers/llvm-lib/Android.bp      |  10 +-
 .../AggressiveInstCombine/Android.bp          |   4 +-
 llvm/lib/Transforms/CFGuard/Android.bp        |   4 +-
 llvm/lib/Transforms/Coroutines/Android.bp     |   4 +-
 llvm/lib/Transforms/Hello/Android.bp          |   4 +-
 llvm/lib/Transforms/HelloNew/Android.bp       |   4 +-
 llvm/lib/Transforms/IPO/Android.bp            |   4 +-
 llvm/lib/Transforms/InstCombine/Android.bp    |   4 +-
 .../lib/Transforms/Instrumentation/Android.bp |   4 +-
 llvm/lib/Transforms/ObjCARC/Android.bp        |   4 +-
 llvm/lib/Transforms/Scalar/Android.bp         |   4 +-
 llvm/lib/Transforms/Utils/Android.bp          |   4 +-
 llvm/lib/Transforms/Vectorize/Android.bp      |   4 +-
 llvm/soong/Android.bp                         |   2 +-
 llvm/soong/llvm.go                            |   6 +-
 llvm/soong/tblgen.go                          |  20 +-
 llvm/tools/llvm-go/llvm-go.go                 |   4 +-
 llvm/utils/TableGen/Android.bp                |  14 +-
 llvm/utils/TableGen/GlobalISel/Android.bp     |  10 +-
 llvm/utils/TableGen/tdtags                    |   2 +-
 122 files changed, 446 insertions(+), 446 deletions(-)

diff --git a/llvm/Android.bp b/llvm/Android.bp
index 98b9fbe52500..2e8ce991c87d 100644
--- a/llvm/Android.bp
+++ b/llvm/Android.bp
@@ -1,14 +1,14 @@
 cc_defaults {
-    name: "llvm-defaults",
-    defaults: ["llvm-defaults-no-generated-headers"],
-    header_libs: ["llvm-headers"],
+    name: "llvm15-defaults",
+    defaults: ["llvm15-defaults-no-generated-headers"],
+    header_libs: ["llvm15-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: "llvm15-defaults-no-generated-headers",
 
     host_supported: true,
     clang: true,
@@ -44,7 +44,7 @@ llvm_defaults {
         "-Wno-error=unreachable-code-loop-increment",
     ],
 
-    header_libs: ["llvm-headers-no-generated-headers"],
+    header_libs: ["llvm15-headers-no-generated-headers"],
 
     target: {
         android: {
@@ -99,7 +99,7 @@ llvm_defaults {
 }
 
 cc_library_headers {
-    name: "llvm-headers-no-generated-headers",
+    name: "llvm15-headers-no-generated-headers",
     vendor_available: true,
     host_supported: true,
     export_include_dirs: ["include"],
@@ -120,26 +120,26 @@ cc_library_headers {
 }
 
 cc_library_headers {
-    name: "llvm-headers",
+    name: "llvm15-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: ["llvm15-headers-no-generated-headers"],
+    export_header_lib_headers: ["llvm15-headers-no-generated-headers"],
     generated_headers: [
-        "llvm-gen-attributes",
-        "llvm-gen-intrinsics",
-        "llvm-gen-revision",
-        "llvm-gen-extension",
-        "llvm-gen-omp_gen",
-        "llvm-gen-acc_gen",
+        "llvm15-gen-attributes",
+        "llvm15-gen-intrinsics",
+        "llvm15-gen-revision",
+        "llvm15-gen-extension",
+        "llvm15-gen-omp_gen",
+        "llvm15-gen-acc_gen",
     ],
     export_generated_headers: [
-        "llvm-gen-attributes",
-        "llvm-gen-intrinsics",
-        "llvm-gen-revision",
-        "llvm-gen-extension",
-        "llvm-gen-omp_gen",
-        "llvm-gen-acc_gen",
+        "llvm15-gen-attributes",
+        "llvm15-gen-intrinsics",
+        "llvm15-gen-revision",
+        "llvm15-gen-extension",
+        "llvm15-gen-omp_gen",
+        "llvm15-gen-acc_gen",
     ],
     target: {
         windows: {
@@ -148,14 +148,14 @@ cc_library_headers {
     },
 }
 
-llvm_tblgen {
-    name: "llvm-gen-attributes",
+llvm15_tblgen {
+    name: "llvm15-gen-attributes",
     in: "include/llvm/IR/Attributes.td",
     outs: ["llvm/IR/Attributes.inc"],
 }
 
-llvm_tblgen {
-    name: "llvm-gen-intrinsics",
+llvm15_tblgen {
+    name: "llvm15-gen-intrinsics",
     in: "include/llvm/IR/Intrinsics.td",
     outs: [
         "llvm/IR/IntrinsicEnums.inc",
@@ -179,8 +179,8 @@ llvm_tblgen {
     ],
 }
 
-llvm_tblgen {
-    name: "llvm-gen-omp_gen",
+llvm15_tblgen {
+    name: "llvm15-gen-omp_gen",
     in: "include/llvm/Frontend/OpenMP/OMP.td",
     outs: [
         "llvm/Frontend/OpenMP/OMP.h.inc",
@@ -188,8 +188,8 @@ llvm_tblgen {
     ],
 }
 
-llvm_tblgen {
-    name: "llvm-gen-acc_gen",
+llvm15_tblgen {
+    name: "llvm15-gen-acc_gen",
     in: "include/llvm/Frontend/OpenACC/ACC.td",
     outs: [
         "llvm/Frontend/OpenMP/ACC.h.inc",
@@ -198,7 +198,7 @@ llvm_tblgen {
 }
 
 genrule {
-    name: "llvm-gen-revision",
+    name: "llvm15-gen-revision",
     out: ["llvm/Support/VCSRevision.h"],
     srcs: [".git/logs/HEAD*"],
     tool_files: ["git_sha1_gen.py"],
@@ -206,15 +206,15 @@ genrule {
 }
 
 genrule {
-    name: "llvm-gen-extension",
+    name: "llvm15-gen-extension",
     out: ["llvm/Support/Extension.def"],
     srcs: [".git/logs/HEAD*"],
     tool_files: ["utils/gn/secondary/llvm/include/llvm/Support/write_extension_def.py"],
     cmd: "python $(location utils/gn/secondary/llvm/include/llvm/Support/write_extension_def.py) --output $(out)",
 }
 
-force_build_llvm_components_defaults {
-    name: "force_build_llvm_components",
+force_build_llvm15_components_defaults {
+    name: "force_build_llvm15_components",
     // Host build disabled by soong/llvm.go unless FORCE_BUILD_LLVM_COMPONENTS
     // environment variable is set
 }
@@ -222,123 +222,123 @@ force_build_llvm_components_defaults {
 // LLVM shared library build
 
 llvm_arm_static_libraries = [
-    "libLLVMARMCodeGen",
-    "libLLVMARMAsmParser",
-    "libLLVMARMAsmPrinter",
-    "libLLVMARMInfo",
-    "libLLVMARMDesc",
-    "libLLVMARMDisassembler",
-    "libLLVMARMUtils",
+    "libLLVM15ARMCodeGen",
+    "libLLVM15ARMAsmParser",
+    "libLLVM15ARMAsmPrinter",
+    "libLLVM15ARMInfo",
+    "libLLVM15ARMDesc",
+    "libLLVM15ARMDisassembler",
+    "libLLVM15ARMUtils",
 ]
 
 llvm_x86_static_libraries = [
-    "libLLVMX86CodeGen",
-    "libLLVMX86Info",
-    "libLLVMX86Desc",
-    "libLLVMX86AsmParser",
-    "libLLVMX86AsmPrinter",
-    "libLLVMX86Utils",
-    "libLLVMX86Disassembler",
+    "libLLVM15X86CodeGen",
+    "libLLVM15X86Info",
+    "libLLVM15X86Desc",
+    "libLLVM15X86AsmParser",
+    "libLLVM15X86AsmPrinter",
+    "libLLVM15X86Utils",
+    "libLLVM15X86Disassembler",
 ]
 
 llvm_mips_static_libraries = [
-    "libLLVMMipsCodeGen",
-    "libLLVMMipsInfo",
-    "libLLVMMipsDesc",
-    "libLLVMMipsAsmParser",
-    "libLLVMMipsAsmPrinter",
-    "libLLVMMipsDisassembler",
+    "libLLVM15MipsCodeGen",
+    "libLLVM15MipsInfo",
+    "libLLVM15MipsDesc",
+    "libLLVM15MipsAsmParser",
+    "libLLVM15MipsAsmPrinter",
+    "libLLVM15MipsDisassembler",
 ]
 
 llvm_aarch64_static_libraries = [
-    "libLLVMAArch64CodeGen",
-    "libLLVMAArch64Info",
-    "libLLVMAArch64Desc",
-    "libLLVMAArch64AsmParser",
-    "libLLVMAArch64AsmPrinter",
-    "libLLVMAArch64Utils",
-    "libLLVMAArch64Disassembler",
+    "libLLVM15AArch64CodeGen",
+    "libLLVM15AArch64Info",
+    "libLLVM15AArch64Desc",
+    "libLLVM15AArch64AsmParser",
+    "libLLVM15AArch64AsmPrinter",
+    "libLLVM15AArch64Utils",
+    "libLLVM15AArch64Disassembler",
 ]
 
 llvm_amdgpu_static_libraries = [
-    "libLLVMAMDGPUCodeGen",
-    "libLLVMAMDGPUInfo",
-    "libLLVMAMDGPUDesc",
-    "libLLVMAMDGPUAsmParser",
-    "libLLVMAMDGPUAsmPrinter",
-    "libLLVMAMDGPUUtils",
-    "libLLVMAMDGPUDisassembler",
+    "libLLVM15AMDGPUCodeGen",
+    "libLLVM15AMDGPUInfo",
+    "libLLVM15AMDGPUDesc",
+    "libLLVM15AMDGPUAsmParser",
+    "libLLVM15AMDGPUAsmPrinter",
+    "libLLVM15AMDGPUUtils",
+    "libLLVM15AMDGPUDisassembler",
 ]
 
 
 cc_library_shared {
     host_supported: true,
     vendor_available: true,
-    name: "libLLVM",
+    name: "libLLVM15",
     defaults: [
-        "llvm-defaults",
-        "force_build_llvm_components",
+        "llvm15-defaults",
+        "force_build_llvm15_components",
     ],
 
     whole_static_libs: [
         // pre static libraries
-        "libLLVMLinker",
-        "libLLVMipo",
-        "libLLVMDebugInfoDWARF",
-        "libLLVMDebugInfoMSF",
-        "libLLVMDebugInfoPDB",
-        "libLLVMSymbolize",
-        "libLLVMIRReader",
-        "libLLVMBitWriter",
-        "libLLVMBitReader",
-        "libLLVMPasses",
-        "libLLVMDemangle",
-        "libLLVMBitstreamReader",
+        "libLLVM15Linker",
+        "libLLVM15ipo",
+        "libLLVM15DebugInfoDWARF",
+        "libLLVM15DebugInfoMSF",
+        "libLLVM15DebugInfoPDB",
+        "libLLVM15Symbolize",
+        "libLLVM15IRReader",
+        "libLLVM15BitWriter",
+        "libLLVM15BitReader",
+        "libLLVM15Passes",
+        "libLLVM15Demangle",
+        "libLLVM15BitstreamReader",
 
         // 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",
-        "libLLVMMIRParser",
-        "libLLVMRemarks",
-        "libLLVMJITLink",
-        "libLLVMCoroutines",
-        "libLLVMTextAPI",
-        "libLLVMCFGuard",
-        "libLLVMFrontendOpenMP",
-        "libLLVMHelloNew",
-        "libLLVMOrcShared",
-        "libLLVMOrcTargetProcess",
-        "libLLVMInterfaceStub",
-        "libLLVMDebuginfod",
+        "libLLVM15LTO",
+        "libLLVM15AsmPrinter",
+        "libLLVM15SelectionDAG",
+        "libLLVM15CodeGen",
+        "libLLVM15DebugInfoCodeView",
+        "libLLVM15Object",
+        "libLLVM15ScalarOpts",
+        "libLLVM15AggressiveInstCombine",
+        "libLLVM15InstCombine",
+        "libLLVM15Instrumentation",
+        "libLLVM15TransformObjCARC",
+        "libLLVM15TransformUtils",
+        "libLLVM15Analysis",
+        "libLLVM15Target",
+        "libLLVM15GlobalISel",
+        "libLLVM15MCDisassembler",
+        "libLLVM15MC",
+        "libLLVM15MCParser",
+        "libLLVM15Core",
+        "libLLVM15AsmParser",
+        "libLLVM15Option",
+        "libLLVM15Support",
+        "libLLVM15Vectorize",
+        "libLLVM15ProfileData",
+        "libLLVM15ProfileDataCoverage",
+        "libLLVM15LibDriver",
+        "libLLVM15ExecutionEngine",
+        "libLLVM15RuntimeDyld",
+        "libLLVM15MCJIT",
+        "libLLVM15OrcJIT",
+        "libLLVM15BinaryFormat",
+        "libLLVM15MIRParser",
+        "libLLVM15Remarks",
+        "libLLVM15JITLink",
+        "libLLVM15Coroutines",
+        "libLLVM15TextAPI",
+        "libLLVM15CFGuard",
+        "libLLVM15FrontendOpenMP",
+        "libLLVM15HelloNew",
+        "libLLVM15OrcShared",
+        "libLLVM15OrcTargetProcess",
+        "libLLVM15InterfaceStub",
+        "libLLVM15Debuginfod",
     ],
 
     export_include_dirs: ["include"],
diff --git a/llvm/bindings/go/llvm/analysis.go b/llvm/bindings/go/llvm/analysis.go
index 3a1c9d34b4dc..521432a1a3dc 100644
--- a/llvm/bindings/go/llvm/analysis.go
+++ b/llvm/bindings/go/llvm/analysis.go
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-package llvm
+package llvm15
 
 /*
 #include "llvm-c/Analysis.h" // If you are getting an error here read bindings/go/README.txt
diff --git a/llvm/bindings/go/llvm/bitreader.go b/llvm/bindings/go/llvm/bitreader.go
index 1954916e717d..35ab8cd79b28 100644
--- a/llvm/bindings/go/llvm/bitreader.go
+++ b/llvm/bindings/go/llvm/bitreader.go
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-package llvm
+package llvm15
 
 /*
 #include "llvm-c/BitReader.h"
diff --git a/llvm/bindings/go/llvm/bitwriter.go b/llvm/bindings/go/llvm/bitwriter.go
index 83780fc69713..1ee829041699 100644
--- a/llvm/bindings/go/llvm/bitwriter.go
+++ b/llvm/bindings/go/llvm/bitwriter.go
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-package llvm
+package llvm15
 
 /*
 #include "llvm-c/BitWriter.h"
diff --git a/llvm/bindings/go/llvm/dibuilder.go b/llvm/bindings/go/llvm/dibuilder.go
index b260f8e3d316..db826c2f858a 100644
--- a/llvm/bindings/go/llvm/dibuilder.go
+++ b/llvm/bindings/go/llvm/dibuilder.go
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-package llvm
+package llvm15
 
 /*
 #include "IRBindings.h"
diff --git a/llvm/bindings/go/llvm/executionengine.go b/llvm/bindings/go/llvm/executionengine.go
index 5fa82047c179..fbdc45c08993 100644
--- a/llvm/bindings/go/llvm/executionengine.go
+++ b/llvm/bindings/go/llvm/executionengine.go
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-package llvm
+package llvm15
 
 /*
 #include "llvm-c/Core.h"
diff --git a/llvm/bindings/go/llvm/executionengine_test.go b/llvm/bindings/go/llvm/executionengine_test.go
index 2369826db914..09a8e8db7d01 100644
--- a/llvm/bindings/go/llvm/executionengine_test.go
+++ b/llvm/bindings/go/llvm/executionengine_test.go
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-package llvm
+package llvm15
 
 import (
 	"testing"
diff --git a/llvm/bindings/go/llvm/ir.go b/llvm/bindings/go/llvm/ir.go
index fef7f011b3d0..164cc0c8a288 100644
--- a/llvm/bindings/go/llvm/ir.go
+++ b/llvm/bindings/go/llvm/ir.go
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-package llvm
+package llvm15
 
 /*
 #include "llvm-c/Core.h"
diff --git a/llvm/bindings/go/llvm/ir_test.go b/llvm/bindings/go/llvm/ir_test.go
index 1aeb6e69bafb..d2a9ca61cf91 100644
--- a/llvm/bindings/go/llvm/ir_test.go
+++ b/llvm/bindings/go/llvm/ir_test.go
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-package llvm
+package llvm15
 
 import (
 	"strings"
diff --git a/llvm/bindings/go/llvm/linker.go b/llvm/bindings/go/llvm/linker.go
index 8e2e953fd465..558490806c7a 100644
--- a/llvm/bindings/go/llvm/linker.go
+++ b/llvm/bindings/go/llvm/linker.go
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-package llvm
+package llvm15
 
 /*
 #include "llvm-c/Core.h"
diff --git a/llvm/bindings/go/llvm/llvm_dep.go b/llvm/bindings/go/llvm/llvm_dep.go
index 9484e6ddf879..b65045fc5bea 100644
--- a/llvm/bindings/go/llvm/llvm_dep.go
+++ b/llvm/bindings/go/llvm/llvm_dep.go
@@ -13,6 +13,6 @@
 
 // +build !byollvm
 
-package llvm
+package llvm15
 
 var _ run_build_sh
diff --git a/llvm/bindings/go/llvm/string.go b/llvm/bindings/go/llvm/string.go
index 7c8bf8da5b36..9d6221e05e22 100644
--- a/llvm/bindings/go/llvm/string.go
+++ b/llvm/bindings/go/llvm/string.go
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-package llvm
+package llvm15
 
 import "fmt"
 
diff --git a/llvm/bindings/go/llvm/string_test.go b/llvm/bindings/go/llvm/string_test.go
index 56cbc9f3e7fd..8218108a7c55 100644
--- a/llvm/bindings/go/llvm/string_test.go
+++ b/llvm/bindings/go/llvm/string_test.go
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-package llvm
+package llvm15
 
 import (
 	"testing"
diff --git a/llvm/bindings/go/llvm/support.go b/llvm/bindings/go/llvm/support.go
index 8a663fee502a..a62b1f752db4 100644
--- a/llvm/bindings/go/llvm/support.go
+++ b/llvm/bindings/go/llvm/support.go
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-package llvm
+package llvm15
 
 /*
 #include "llvm-c/Support.h"
diff --git a/llvm/bindings/go/llvm/target.go b/llvm/bindings/go/llvm/target.go
index cdd0fa30c3f5..a7c06438d467 100644
--- a/llvm/bindings/go/llvm/target.go
+++ b/llvm/bindings/go/llvm/target.go
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-package llvm
+package llvm15
 
 /*
 #include "llvm-c/Core.h"
diff --git a/llvm/bindings/go/llvm/transforms_instrumentation.go b/llvm/bindings/go/llvm/transforms_instrumentation.go
index 15a1f1abdba0..7dd7203d031e 100644
--- a/llvm/bindings/go/llvm/transforms_instrumentation.go
+++ b/llvm/bindings/go/llvm/transforms_instrumentation.go
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-package llvm
+package llvm15
 
 /*
 #include "InstrumentationBindings.h"
diff --git a/llvm/bindings/go/llvm/transforms_ipo.go b/llvm/bindings/go/llvm/transforms_ipo.go
index 3f9ae5df6caf..d3520c82492d 100644
--- a/llvm/bindings/go/llvm/transforms_ipo.go
+++ b/llvm/bindings/go/llvm/transforms_ipo.go
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-package llvm
+package llvm15
 
 /*
 #include "llvm-c/Transforms/IPO.h"
diff --git a/llvm/bindings/go/llvm/transforms_pmbuilder.go b/llvm/bindings/go/llvm/transforms_pmbuilder.go
index 2c902a140dc4..d46605a758b6 100644
--- a/llvm/bindings/go/llvm/transforms_pmbuilder.go
+++ b/llvm/bindings/go/llvm/transforms_pmbuilder.go
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-package llvm
+package llvm15
 
 /*
 #include "llvm-c/Transforms/PassManagerBuilder.h"
diff --git a/llvm/bindings/go/llvm/transforms_scalar.go b/llvm/bindings/go/llvm/transforms_scalar.go
index a6dc02c13054..209455b78ff7 100644
--- a/llvm/bindings/go/llvm/transforms_scalar.go
+++ b/llvm/bindings/go/llvm/transforms_scalar.go
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-package llvm
+package llvm15
 
 /*
 #include "llvm-c/Transforms/Scalar.h"
diff --git a/llvm/bindings/go/llvm/version.go b/llvm/bindings/go/llvm/version.go
index 1183fe431b97..e382b285778b 100644
--- a/llvm/bindings/go/llvm/version.go
+++ b/llvm/bindings/go/llvm/version.go
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-package llvm
+package llvm15
 
 /*
 #include "llvm/Config/llvm-config.h"
diff --git a/llvm/lib/Analysis/Android.bp b/llvm/lib/Analysis/Android.bp
index d5549d1f8db2..15489280e7b2 100644
--- a/llvm/lib/Analysis/Android.bp
+++ b/llvm/lib/Analysis/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMAnalysis",
+    name: "libLLVM15Analysis",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm15-lib-defaults",
     ],
     srcs: [
         "AliasAnalysis.cpp",
diff --git a/llvm/lib/Android.bp b/llvm/lib/Android.bp
index 127ba59ce3c3..c17e8f33ef1c 100644
--- a/llvm/lib/Android.bp
+++ b/llvm/lib/Android.bp
@@ -1,8 +1,8 @@
 cc_defaults {
-    name: "llvm-lib-defaults",
+    name: "llvm15-lib-defaults",
     vendor_available: true,
-    defaults: ["llvm-defaults"],
-    export_header_lib_headers: ["llvm-headers"],
+    defaults: ["llvm15-defaults"],
+    export_header_lib_headers: ["llvm15-headers"],
     target: {
         windows: {
             enabled: true,
diff --git a/llvm/lib/AsmParser/Android.bp b/llvm/lib/AsmParser/Android.bp
index 3fff6b26b9ae..98ceaffb6cbe 100644
--- a/llvm/lib/AsmParser/Android.bp
+++ b/llvm/lib/AsmParser/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMAsmParser",
+    name: "libLLVM15AsmParser",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm15-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/BinaryFormat/Android.bp b/llvm/lib/BinaryFormat/Android.bp
index b99bb0a082a0..36190254f8dd 100644
--- a/llvm/lib/BinaryFormat/Android.bp
+++ b/llvm/lib/BinaryFormat/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMBinaryFormat",
+    name: "libLLVM15BinaryFormat",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm15-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/Bitcode/Reader/Android.bp b/llvm/lib/Bitcode/Reader/Android.bp
index da7c543e214c..9da472450591 100644
--- a/llvm/lib/Bitcode/Reader/Android.bp
+++ b/llvm/lib/Bitcode/Reader/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMBitReader",
+    name: "libLLVM15BitReader",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm15-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/Bitcode/Writer/Android.bp b/llvm/lib/Bitcode/Writer/Android.bp
index 754a252a7d80..ce3e19105fac 100644
--- a/llvm/lib/Bitcode/Writer/Android.bp
+++ b/llvm/lib/Bitcode/Writer/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMBitWriter",
+    name: "libLLVM15BitWriter",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm15-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/Bitstream/Reader/Android.bp b/llvm/lib/Bitstream/Reader/Android.bp
index 6300d088289f..f75e4ae0e120 100644
--- a/llvm/lib/Bitstream/Reader/Android.bp
+++ b/llvm/lib/Bitstream/Reader/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMBitstreamReader",
+    name: "libLLVM15BitstreamReader",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm15-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/CodeGen/Android.bp b/llvm/lib/CodeGen/Android.bp
index 35e83f36ec51..e80f87d1b53b 100644
--- a/llvm/lib/CodeGen/Android.bp
+++ b/llvm/lib/CodeGen/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMCodeGen",
+    name: "libLLVM15CodeGen",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm15-lib-defaults",
     ],
     srcs: [
         "*.cpp",
diff --git a/llvm/lib/CodeGen/AsmPrinter/Android.bp b/llvm/lib/CodeGen/AsmPrinter/Android.bp
index d94c00ccdf54..2c71ad382c81 100644
--- a/llvm/lib/CodeGen/AsmPrinter/Android.bp
+++ b/llvm/lib/CodeGen/AsmPrinter/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMAsmPrinter",
+    name: "libLLVM15AsmPrinter",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm15-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/CodeGen/GlobalISel/Android.bp b/llvm/lib/CodeGen/GlobalISel/Android.bp
index 4dd07c6b511c..a5accf22be2c 100644
--- a/llvm/lib/CodeGen/GlobalISel/Android.bp
+++ b/llvm/lib/CodeGen/GlobalISel/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMGlobalISel",
+    name: "libLLVM15GlobalISel",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm15-lib-defaults",
     ],
     // Aarch64 and AMDGPU targets require GlobalIsel
     // Experimental feature enabled by building all srcs
diff --git a/llvm/lib/CodeGen/MIRParser/Android.bp b/llvm/lib/CodeGen/MIRParser/Android.bp
index 4c68ec63b316..6785bde6bde3 100644
--- a/llvm/lib/CodeGen/MIRParser/Android.bp
+++ b/llvm/lib/CodeGen/MIRParser/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMMIRParser",
+    name: "libLLVM15MIRParser",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm15-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/CodeGen/SelectionDAG/Android.bp b/llvm/lib/CodeGen/SelectionDAG/Android.bp
index 79c705aad151..b0d19870020a 100644
--- a/llvm/lib/CodeGen/SelectionDAG/Android.bp
+++ b/llvm/lib/CodeGen/SelectionDAG/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMSelectionDAG",
+    name: "libLLVM15SelectionDAG",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm15-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/DebugInfo/CodeView/Android.bp b/llvm/lib/DebugInfo/CodeView/Android.bp
index 6abfae166597..432efae41c55 100644
--- a/llvm/lib/DebugInfo/CodeView/Android.bp
+++ b/llvm/lib/DebugInfo/CodeView/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMDebugInfoCodeView",
+    name: "libLLVM15DebugInfoCodeView",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm15-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/DebugInfo/DWARF/Android.bp b/llvm/lib/DebugInfo/DWARF/Android.bp
index c198e1f111bb..55998ab589db 100644
--- a/llvm/lib/DebugInfo/DWARF/Android.bp
+++ b/llvm/lib/DebugInfo/DWARF/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMDebugInfoDWARF",
+    name: "libLLVM15DebugInfoDWARF",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm15-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/DebugInfo/MSF/Android.bp b/llvm/lib/DebugInfo/MSF/Android.bp
index 9b096bd6d316..44b32d8b70e2 100644
--- a/llvm/lib/DebugInfo/MSF/Android.bp
+++ b/llvm/lib/DebugInfo/MSF/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMDebugInfoMSF",
+    name: "libLLVM15DebugInfoMSF",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm15-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/DebugInfo/PDB/Android.bp b/llvm/lib/DebugInfo/PDB/Android.bp
index 2ef641f4b41e..1aefc24373f7 100644
--- a/llvm/lib/DebugInfo/PDB/Android.bp
+++ b/llvm/lib/DebugInfo/PDB/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMDebugInfoPDB",
+    name: "libLLVM15DebugInfoPDB",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm15-lib-defaults",
     ],
     srcs: [
         "*.cpp",
diff --git a/llvm/lib/DebugInfo/Symbolize/Android.bp b/llvm/lib/DebugInfo/Symbolize/Android.bp
index c859f58a8abe..05d7d4f3d88a 100644
--- a/llvm/lib/DebugInfo/Symbolize/Android.bp
+++ b/llvm/lib/DebugInfo/Symbolize/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMSymbolize",
+    name: "libLLVM15Symbolize",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm15-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/Debuginfod/Android.bp b/llvm/lib/Debuginfod/Android.bp
index 731bb3cc25dc..ec112bcf10c9 100644
--- a/llvm/lib/Debuginfod/Android.bp
+++ b/llvm/lib/Debuginfod/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMDebuginfod",
+    name: "libLLVM15Debuginfod",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm15-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/Demangle/Android.bp b/llvm/lib/Demangle/Android.bp
index 476e71874799..27231a216ccc 100644
--- a/llvm/lib/Demangle/Android.bp
+++ b/llvm/lib/Demangle/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMDemangle",
+    name: "libLLVM15Demangle",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm15-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/ExecutionEngine/Android.bp b/llvm/lib/ExecutionEngine/Android.bp
index 41a44925ba89..73e95ba43dfa 100644
--- a/llvm/lib/ExecutionEngine/Android.bp
+++ b/llvm/lib/ExecutionEngine/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMExecutionEngine",
+    name: "libLLVM15ExecutionEngine",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm15-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/ExecutionEngine/Interpreter/Android.bp b/llvm/lib/ExecutionEngine/Interpreter/Android.bp
index 190a9a86c506..0b5b44a097bb 100644
--- a/llvm/lib/ExecutionEngine/Interpreter/Android.bp
+++ b/llvm/lib/ExecutionEngine/Interpreter/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMInterpreter",
+    name: "libLLVM15Interpreter",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm15-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/ExecutionEngine/JITLink/Android.bp b/llvm/lib/ExecutionEngine/JITLink/Android.bp
index f613f7a0e43d..e98b7dd70e09 100644
--- a/llvm/lib/ExecutionEngine/JITLink/Android.bp
+++ b/llvm/lib/ExecutionEngine/JITLink/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMJITLink",
+    name: "libLLVM15JITLink",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm15-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/ExecutionEngine/MCJIT/Android.bp b/llvm/lib/ExecutionEngine/MCJIT/Android.bp
index 6b43bb17d026..723d1dbbb58d 100644
--- a/llvm/lib/ExecutionEngine/MCJIT/Android.bp
+++ b/llvm/lib/ExecutionEngine/MCJIT/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMMCJIT",
+    name: "libLLVM15MCJIT",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm15-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/ExecutionEngine/Orc/Android.bp b/llvm/lib/ExecutionEngine/Orc/Android.bp
index 1bb2faeaf80d..03ae318077bf 100644
--- a/llvm/lib/ExecutionEngine/Orc/Android.bp
+++ b/llvm/lib/ExecutionEngine/Orc/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMOrcJIT",
+    name: "libLLVM15OrcJIT",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm15-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/ExecutionEngine/Orc/Shared/Android.bp b/llvm/lib/ExecutionEngine/Orc/Shared/Android.bp
index 5e5497252dbf..7f1a01ea2a19 100644
--- a/llvm/lib/ExecutionEngine/Orc/Shared/Android.bp
+++ b/llvm/lib/ExecutionEngine/Orc/Shared/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMOrcShared",
+    name: "libLLVM15OrcShared",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm15-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/ExecutionEngine/Orc/TargetProcess/Android.bp b/llvm/lib/ExecutionEngine/Orc/TargetProcess/Android.bp
index 840e3ffda122..703501d41863 100644
--- a/llvm/lib/ExecutionEngine/Orc/TargetProcess/Android.bp
+++ b/llvm/lib/ExecutionEngine/Orc/TargetProcess/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMOrcTargetProcess",
+    name: "libLLVM15OrcTargetProcess",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm15-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/ExecutionEngine/RuntimeDyld/Android.bp b/llvm/lib/ExecutionEngine/RuntimeDyld/Android.bp
index 408077ff8471..1f25659bd75a 100644
--- a/llvm/lib/ExecutionEngine/RuntimeDyld/Android.bp
+++ b/llvm/lib/ExecutionEngine/RuntimeDyld/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMRuntimeDyld",
+    name: "libLLVM15RuntimeDyld",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm15-lib-defaults",
     ],
     srcs: [
         "*.cpp",
diff --git a/llvm/lib/Frontend/OpenACC/Android.bp b/llvm/lib/Frontend/OpenACC/Android.bp
index 2596faa1ec29..b11958d867c8 100644
--- a/llvm/lib/Frontend/OpenACC/Android.bp
+++ b/llvm/lib/Frontend/OpenACC/Android.bp
@@ -1,12 +1,12 @@
 cc_library_static {
-    name: "libLLVMFrontendOpenACC",
+    name: "libLLVM15FrontendOpenACC",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm15-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }
 
 cc_defaults {
     name: "llvm-acc-defaults",
-    generated_headers: ["llvm-gen-acc_gen"],
+    generated_headers: ["llvm15-gen-acc_gen"],
 }
diff --git a/llvm/lib/Frontend/OpenMP/Android.bp b/llvm/lib/Frontend/OpenMP/Android.bp
index 4491b4974c1b..cd57764f3c7d 100644
--- a/llvm/lib/Frontend/OpenMP/Android.bp
+++ b/llvm/lib/Frontend/OpenMP/Android.bp
@@ -1,12 +1,12 @@
 cc_library_static {
-    name: "libLLVMFrontendOpenMP",
+    name: "libLLVM15FrontendOpenMP",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm15-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }
 
 cc_defaults {
     name: "llvm-omp-defaults",
-    generated_headers: ["llvm-gen-omp_gen"],
+    generated_headers: ["llvm15-gen-omp_gen"],
 }
diff --git a/llvm/lib/IR/Android.bp b/llvm/lib/IR/Android.bp
index 385691844e3f..086b2aabca40 100644
--- a/llvm/lib/IR/Android.bp
+++ b/llvm/lib/IR/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMCore",
+    name: "libLLVM15Core",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm15-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/IRReader/Android.bp b/llvm/lib/IRReader/Android.bp
index a01a80fb828e..1d9bcc10cddb 100644
--- a/llvm/lib/IRReader/Android.bp
+++ b/llvm/lib/IRReader/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMIRReader",
+    name: "libLLVM15IRReader",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm15-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/InterfaceStub/Android.bp b/llvm/lib/InterfaceStub/Android.bp
index 7d72c4823558..2bf19b757237 100644
--- a/llvm/lib/InterfaceStub/Android.bp
+++ b/llvm/lib/InterfaceStub/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMInterfaceStub",
+    name: "libLLVM15InterfaceStub",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm15-lib-defaults",
     ],
     srcs: [
         "*.cpp",
diff --git a/llvm/lib/LTO/Android.bp b/llvm/lib/LTO/Android.bp
index 928bd5c909bc..f771f2b6024f 100644
--- a/llvm/lib/LTO/Android.bp
+++ b/llvm/lib/LTO/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMLTO",
+    name: "libLLVM15LTO",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm15-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/Linker/Android.bp b/llvm/lib/Linker/Android.bp
index a5e1a95359c4..26c7ac8ccb6d 100644
--- a/llvm/lib/Linker/Android.bp
+++ b/llvm/lib/Linker/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMLinker",
+    name: "libLLVM15Linker",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm15-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/MC/Android.bp b/llvm/lib/MC/Android.bp
index 05e8445f7f96..b1e3dbbae00b 100644
--- a/llvm/lib/MC/Android.bp
+++ b/llvm/lib/MC/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMMC",
+    name: "libLLVM15MC",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm15-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/MC/MCDisassembler/Android.bp b/llvm/lib/MC/MCDisassembler/Android.bp
index c2f25fa3d220..2a5b21da61ed 100644
--- a/llvm/lib/MC/MCDisassembler/Android.bp
+++ b/llvm/lib/MC/MCDisassembler/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMMCDisassembler",
+    name: "libLLVM15MCDisassembler",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm15-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/MC/MCParser/Android.bp b/llvm/lib/MC/MCParser/Android.bp
index cc7cd1f01358..24ec9ceba692 100644
--- a/llvm/lib/MC/MCParser/Android.bp
+++ b/llvm/lib/MC/MCParser/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMMCParser",
+    name: "libLLVM15MCParser",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm15-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/Object/Android.bp b/llvm/lib/Object/Android.bp
index c389476fd628..d40814354f09 100644
--- a/llvm/lib/Object/Android.bp
+++ b/llvm/lib/Object/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMObject",
+    name: "libLLVM15Object",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm15-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/ObjectYAML/Android.bp b/llvm/lib/ObjectYAML/Android.bp
index 17f4a6796b8e..72fa788b1b2c 100644
--- a/llvm/lib/ObjectYAML/Android.bp
+++ b/llvm/lib/ObjectYAML/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMObjectYAML",
+    name: "libLLVM15ObjectYAML",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm15-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/Option/Android.bp b/llvm/lib/Option/Android.bp
index 035db4d7d483..75a9d221f4cd 100644
--- a/llvm/lib/Option/Android.bp
+++ b/llvm/lib/Option/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMOption",
+    name: "libLLVM15Option",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm15-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/Passes/Android.bp b/llvm/lib/Passes/Android.bp
index f98e1b66c8cd..e728e8026720 100644
--- a/llvm/lib/Passes/Android.bp
+++ b/llvm/lib/Passes/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMPasses",
+    name: "libLLVM15Passes",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm15-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/ProfileData/Android.bp b/llvm/lib/ProfileData/Android.bp
index 710d5d406f15..1c5f045173b8 100644
--- a/llvm/lib/ProfileData/Android.bp
+++ b/llvm/lib/ProfileData/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMProfileData",
+    name: "libLLVM15ProfileData",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm15-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/ProfileData/Coverage/Android.bp b/llvm/lib/ProfileData/Coverage/Android.bp
index 347c500133b9..119398398a2f 100644
--- a/llvm/lib/ProfileData/Coverage/Android.bp
+++ b/llvm/lib/ProfileData/Coverage/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMProfileDataCoverage",
+    name: "libLLVM15ProfileDataCoverage",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm15-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/Remarks/Android.bp b/llvm/lib/Remarks/Android.bp
index 6ea22e87f48f..7041266ddfb1 100644
--- a/llvm/lib/Remarks/Android.bp
+++ b/llvm/lib/Remarks/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMRemarks",
+    name: "libLLVM15Remarks",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm15-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/Support/Android.bp b/llvm/lib/Support/Android.bp
index d00de3f26799..93cb173adf6f 100644
--- a/llvm/lib/Support/Android.bp
+++ b/llvm/lib/Support/Android.bp
@@ -1,10 +1,10 @@
 cc_library_static {
-    name: "libLLVMSupport",
+    name: "libLLVM15Support",
     vendor_available: true,
-    defaults: ["llvm-defaults-no-generated-headers"],
+    defaults: ["llvm15-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
+        // llvm15-defaults turns off host builds by default, turn it back on for
+        // modules that are used to build llvm15-tblgen
         host: {
             enabled: true,
         },
diff --git a/llvm/lib/TableGen/Android.bp b/llvm/lib/TableGen/Android.bp
index c3310178d698..ec965b55bcbc 100644
--- a/llvm/lib/TableGen/Android.bp
+++ b/llvm/lib/TableGen/Android.bp
@@ -1,10 +1,10 @@
 cc_library_static {
-    name: "libLLVMTableGen",
-    defaults: ["llvm-defaults-no-generated-headers"],
+    name: "libLLVM15TableGen",
+    defaults: ["llvm15-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
+        // llvm15-defaults turns off host builds by default, turn it back on for
+        // modules that are used to build llvm15-tblgen
         host: {
             enabled: true,
         },
diff --git a/llvm/lib/Target/AArch64/Android.bp b/llvm/lib/Target/AArch64/Android.bp
index 37011a5dbe3d..14773dec28fb 100644
--- a/llvm/lib/Target/AArch64/Android.bp
+++ b/llvm/lib/Target/AArch64/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMAArch64CodeGen",
+    name: "libLLVM15AArch64CodeGen",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-aarch64-defaults",
+        "llvm15-lib-defaults",
+        "llvm15-aarch64-defaults",
     ],
     srcs: [
         "*.cpp",
@@ -11,13 +11,13 @@ cc_library_static {
 }
 
 cc_defaults {
-    name: "llvm-aarch64-defaults",
-    generated_headers: ["llvm-gen-aarch64"],
-    static_libs: ["llvm-aarch64-headers"],
+    name: "llvm15-aarch64-defaults",
+    generated_headers: ["llvm15-gen-aarch64"],
+    static_libs: ["llvm15-aarch64-headers"],
 }
 
 cc_library_static {
-    name: "llvm-aarch64-headers",
+    name: "llvm15-aarch64-headers",
     vendor_available: true,
     host_supported: true,
     target: {
@@ -28,8 +28,8 @@ cc_library_static {
     export_include_dirs: ["."],
 }
 
-llvm_tblgen {
-    name: "llvm-gen-aarch64",
+llvm15_tblgen {
+    name: "llvm15-gen-aarch64",
     in: "AArch64.td",
     outs: [
         "AArch64GenRegisterInfo.inc",
diff --git a/llvm/lib/Target/AArch64/AsmParser/Android.bp b/llvm/lib/Target/AArch64/AsmParser/Android.bp
index 9b409aec2c48..ed4dbce958cc 100644
--- a/llvm/lib/Target/AArch64/AsmParser/Android.bp
+++ b/llvm/lib/Target/AArch64/AsmParser/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMAArch64AsmParser",
+    name: "libLLVM15AArch64AsmParser",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-aarch64-defaults",
+        "llvm15-lib-defaults",
+        "llvm15-aarch64-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/Target/AArch64/Disassembler/Android.bp b/llvm/lib/Target/AArch64/Disassembler/Android.bp
index e7a04d35e32f..dd110a0850ab 100644
--- a/llvm/lib/Target/AArch64/Disassembler/Android.bp
+++ b/llvm/lib/Target/AArch64/Disassembler/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMAArch64Disassembler",
+    name: "libLLVM15AArch64Disassembler",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-aarch64-defaults",
+        "llvm15-lib-defaults",
+        "llvm15-aarch64-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/Target/AArch64/InstPrinter/Android.bp b/llvm/lib/Target/AArch64/InstPrinter/Android.bp
index f1dac2a89f98..7cf00826d45b 100644
--- a/llvm/lib/Target/AArch64/InstPrinter/Android.bp
+++ b/llvm/lib/Target/AArch64/InstPrinter/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMAArch64AsmPrinter",
+    name: "libLLVM15AArch64AsmPrinter",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-aarch64-defaults",
+        "llvm15-lib-defaults",
+        "llvm15-aarch64-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/Target/AArch64/MCTargetDesc/Android.bp b/llvm/lib/Target/AArch64/MCTargetDesc/Android.bp
index 9edc154a635c..eb147e75537f 100644
--- a/llvm/lib/Target/AArch64/MCTargetDesc/Android.bp
+++ b/llvm/lib/Target/AArch64/MCTargetDesc/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMAArch64Desc",
+    name: "libLLVM15AArch64Desc",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-aarch64-defaults",
+        "llvm15-lib-defaults",
+        "llvm15-aarch64-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/Target/AArch64/TargetInfo/Android.bp b/llvm/lib/Target/AArch64/TargetInfo/Android.bp
index baa98cad20fb..5bfa80d5d8d3 100644
--- a/llvm/lib/Target/AArch64/TargetInfo/Android.bp
+++ b/llvm/lib/Target/AArch64/TargetInfo/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMAArch64Info",
+    name: "libLLVM15AArch64Info",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-aarch64-defaults",
+        "llvm15-lib-defaults",
+        "llvm15-aarch64-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/Target/AArch64/Utils/Android.bp b/llvm/lib/Target/AArch64/Utils/Android.bp
index aa2db82bb61d..d35e78d7cb42 100644
--- a/llvm/lib/Target/AArch64/Utils/Android.bp
+++ b/llvm/lib/Target/AArch64/Utils/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMAArch64Utils",
+    name: "libLLVM15AArch64Utils",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-aarch64-defaults",
+        "llvm15-lib-defaults",
+        "llvm15-aarch64-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/Target/AMDGPU/Android.bp b/llvm/lib/Target/AMDGPU/Android.bp
index 1c605f5939e9..9b25f6d493dc 100644
--- a/llvm/lib/Target/AMDGPU/Android.bp
+++ b/llvm/lib/Target/AMDGPU/Android.bp
@@ -1,25 +1,25 @@
 cc_library_static {
-    name: "libLLVMAMDGPUCodeGen",
+    name: "libLLVM15AMDGPUCodeGen",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-amdgpu-defaults",
+        "llvm15-lib-defaults",
+        "llvm15-amdgpu-defaults",
     ],
     srcs: ["*.cpp"],
 }
 
 cc_defaults {
-    name: "llvm-amdgpu-defaults",
+    name: "llvm15-amdgpu-defaults",
     generated_headers: [
-        "llvm-gen-amdgpu",
-        "llvm-gen-amdgpuisel",
-        "llvm-gen-instcombine",
-        "llvm-gen-r600",
+        "llvm15-gen-amdgpu",
+        "llvm15-gen-amdgpuisel",
+        "llvm15-gen-instcombine",
+        "llvm15-gen-r600",
     ],
-    static_libs: ["llvm-amdgpu-headers"],
+    static_libs: ["llvm15-amdgpu-headers"],
 }
 
 cc_library_static {
-    name: "llvm-amdgpu-headers",
+    name: "llvm15-amdgpu-headers",
     host_supported: true,
     vendor_available: true,
     target: {
@@ -30,8 +30,8 @@ cc_library_static {
     export_include_dirs: ["."],
 }
 
-llvm_tblgen {
-    name: "llvm-gen-amdgpu",
+llvm15_tblgen {
+    name: "llvm15-gen-amdgpu",
     in: "AMDGPU.td",
     outs: [
         "AMDGPUGenRegisterInfo.inc",
@@ -51,8 +51,8 @@ llvm_tblgen {
     ],
 }
 
-llvm_tblgen {
-    name: "llvm-gen-amdgpuisel",
+llvm15_tblgen {
+    name: "llvm15-gen-amdgpuisel",
     in: "AMDGPUGISel.td",
     outs: [
         "AMDGPUGenGlobalISel.inc",
@@ -62,14 +62,14 @@ llvm_tblgen {
     ],
 }
 
-llvm_tblgen {
-    name: "llvm-gen-instcombine",
+llvm15_tblgen {
+    name: "llvm15-gen-instcombine",
     in: "InstCombineTables.td",
     outs: ["InstCombineTables.inc"],
 }
 
-llvm_tblgen {
-    name: "llvm-gen-r600",
+llvm15_tblgen {
+    name: "llvm15-gen-r600",
     in: "R600.td",
     outs: [
         "R600GenAsmWriter.inc",
diff --git a/llvm/lib/Target/AMDGPU/AsmParser/Android.bp b/llvm/lib/Target/AMDGPU/AsmParser/Android.bp
index 9e6fd0883e1d..d1e517ffdba2 100644
--- a/llvm/lib/Target/AMDGPU/AsmParser/Android.bp
+++ b/llvm/lib/Target/AMDGPU/AsmParser/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMAMDGPUAsmParser",
+    name: "libLLVM15AMDGPUAsmParser",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-amdgpu-defaults",
+        "llvm15-lib-defaults",
+        "llvm15-amdgpu-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/Target/AMDGPU/Disassembler/Android.bp b/llvm/lib/Target/AMDGPU/Disassembler/Android.bp
index b184ef016286..5e0cf1e6ed9f 100644
--- a/llvm/lib/Target/AMDGPU/Disassembler/Android.bp
+++ b/llvm/lib/Target/AMDGPU/Disassembler/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMAMDGPUDisassembler",
+    name: "libLLVM15AMDGPUDisassembler",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-amdgpu-defaults",
+        "llvm15-lib-defaults",
+        "llvm15-amdgpu-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/Target/AMDGPU/InstPrinter/Android.bp b/llvm/lib/Target/AMDGPU/InstPrinter/Android.bp
index 0ee4ec3dcd99..318e5002caf3 100644
--- a/llvm/lib/Target/AMDGPU/InstPrinter/Android.bp
+++ b/llvm/lib/Target/AMDGPU/InstPrinter/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMAMDGPUAsmPrinter",
+    name: "libLLVM15AMDGPUAsmPrinter",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-amdgpu-defaults",
+        "llvm15-lib-defaults",
+        "llvm15-amdgpu-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/Target/AMDGPU/MCTargetDesc/Android.bp b/llvm/lib/Target/AMDGPU/MCTargetDesc/Android.bp
index 93a6ea5c3cae..db75421adf9a 100644
--- a/llvm/lib/Target/AMDGPU/MCTargetDesc/Android.bp
+++ b/llvm/lib/Target/AMDGPU/MCTargetDesc/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMAMDGPUDesc",
+    name: "libLLVM15AMDGPUDesc",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-amdgpu-defaults",
+        "llvm15-lib-defaults",
+        "llvm15-amdgpu-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/Target/AMDGPU/TargetInfo/Android.bp b/llvm/lib/Target/AMDGPU/TargetInfo/Android.bp
index db94c04bc92d..f81d8b07a17e 100644
--- a/llvm/lib/Target/AMDGPU/TargetInfo/Android.bp
+++ b/llvm/lib/Target/AMDGPU/TargetInfo/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMAMDGPUInfo",
+    name: "libLLVM15AMDGPUInfo",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-amdgpu-defaults",
+        "llvm15-lib-defaults",
+        "llvm15-amdgpu-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/Target/AMDGPU/Utils/Android.bp b/llvm/lib/Target/AMDGPU/Utils/Android.bp
index f6fb594d1574..a68c39cc4f5a 100644
--- a/llvm/lib/Target/AMDGPU/Utils/Android.bp
+++ b/llvm/lib/Target/AMDGPU/Utils/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMAMDGPUUtils",
+    name: "libLLVM15AMDGPUUtils",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-amdgpu-defaults",
+        "llvm15-lib-defaults",
+        "llvm15-amdgpu-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/Target/ARM/Android.bp b/llvm/lib/Target/ARM/Android.bp
index 544f00880c3d..e32389123787 100644
--- a/llvm/lib/Target/ARM/Android.bp
+++ b/llvm/lib/Target/ARM/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMARMCodeGen",
+    name: "libLLVM15ARMCodeGen",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-arm-defaults",
+        "llvm15-lib-defaults",
+        "llvm15-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: "llvm15-arm-defaults",
+    generated_headers: ["llvm15-gen-arm"],
+    static_libs: ["llvm15-arm-headers"],
 }
 
 cc_library_static {
-    name: "llvm-arm-headers",
+    name: "llvm15-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",
+llvm15_tblgen {
+    name: "llvm15-gen-arm",
     in: "ARM.td",
     outs: [
         "ARMGenRegisterInfo.inc",
diff --git a/llvm/lib/Target/ARM/AsmParser/Android.bp b/llvm/lib/Target/ARM/AsmParser/Android.bp
index 3340db5a00f0..d6cfe2130f48 100644
--- a/llvm/lib/Target/ARM/AsmParser/Android.bp
+++ b/llvm/lib/Target/ARM/AsmParser/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMARMAsmParser",
+    name: "libLLVM15ARMAsmParser",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-arm-defaults",
+        "llvm15-lib-defaults",
+        "llvm15-arm-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/Target/ARM/Disassembler/Android.bp b/llvm/lib/Target/ARM/Disassembler/Android.bp
index 8deda869ecb7..01edd28593ef 100644
--- a/llvm/lib/Target/ARM/Disassembler/Android.bp
+++ b/llvm/lib/Target/ARM/Disassembler/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMARMDisassembler",
+    name: "libLLVM15ARMDisassembler",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-arm-defaults",
+        "llvm15-lib-defaults",
+        "llvm15-arm-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/Target/ARM/InstPrinter/Android.bp b/llvm/lib/Target/ARM/InstPrinter/Android.bp
index f54529f96cf2..ad6fbe87ac0e 100644
--- a/llvm/lib/Target/ARM/InstPrinter/Android.bp
+++ b/llvm/lib/Target/ARM/InstPrinter/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMARMAsmPrinter",
+    name: "libLLVM15ARMAsmPrinter",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-arm-defaults",
+        "llvm15-lib-defaults",
+        "llvm15-arm-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/Target/ARM/MCTargetDesc/Android.bp b/llvm/lib/Target/ARM/MCTargetDesc/Android.bp
index de05686195be..9e32d8c7e5ee 100644
--- a/llvm/lib/Target/ARM/MCTargetDesc/Android.bp
+++ b/llvm/lib/Target/ARM/MCTargetDesc/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMARMDesc",
+    name: "libLLVM15ARMDesc",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-arm-defaults",
+        "llvm15-lib-defaults",
+        "llvm15-arm-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/Target/ARM/TargetInfo/Android.bp b/llvm/lib/Target/ARM/TargetInfo/Android.bp
index cfead24187b9..da2a2c025b2e 100644
--- a/llvm/lib/Target/ARM/TargetInfo/Android.bp
+++ b/llvm/lib/Target/ARM/TargetInfo/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMARMInfo",
+    name: "libLLVM15ARMInfo",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-arm-defaults",
+        "llvm15-lib-defaults",
+        "llvm15-arm-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/Target/ARM/Utils/Android.bp b/llvm/lib/Target/ARM/Utils/Android.bp
index bd2ae34207c2..3a834c008707 100644
--- a/llvm/lib/Target/ARM/Utils/Android.bp
+++ b/llvm/lib/Target/ARM/Utils/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMARMUtils",
+    name: "libLLVM15ARMUtils",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-arm-defaults",
+        "llvm15-lib-defaults",
+        "llvm15-arm-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/Target/Android.bp b/llvm/lib/Target/Android.bp
index 5101e66259aa..88200a397b53 100644
--- a/llvm/lib/Target/Android.bp
+++ b/llvm/lib/Target/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMTarget",
+    name: "libLLVM15Target",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm15-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/Target/Mips/Android.bp b/llvm/lib/Target/Mips/Android.bp
index 8e1a99d55e6f..c1cb5000b351 100644
--- a/llvm/lib/Target/Mips/Android.bp
+++ b/llvm/lib/Target/Mips/Android.bp
@@ -1,20 +1,20 @@
 cc_library_static {
-    name: "libLLVMMipsCodeGen",
+    name: "libLLVM15MipsCodeGen",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-mips-defaults",
+        "llvm15-lib-defaults",
+        "llvm15-mips-defaults",
     ],
     srcs: ["*.cpp"],
 }
 
 cc_defaults {
-    name: "llvm-mips-defaults",
-    generated_headers: ["llvm-gen-mips"],
-    static_libs: ["llvm-mips-headers"],
+    name: "llvm15-mips-defaults",
+    generated_headers: ["llvm15-gen-mips"],
+    static_libs: ["llvm15-mips-headers"],
 }
 
 cc_library_static {
-    name: "llvm-mips-headers",
+    name: "llvm15-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",
+llvm15_tblgen {
+    name: "llvm15-gen-mips",
     in: "Mips.td",
     outs: [
         "MipsGenRegisterInfo.inc",
diff --git a/llvm/lib/Target/Mips/AsmParser/Android.bp b/llvm/lib/Target/Mips/AsmParser/Android.bp
index b61dd02d9e0b..13e82552328f 100644
--- a/llvm/lib/Target/Mips/AsmParser/Android.bp
+++ b/llvm/lib/Target/Mips/AsmParser/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMMipsAsmParser",
+    name: "libLLVM15MipsAsmParser",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-mips-defaults",
+        "llvm15-lib-defaults",
+        "llvm15-mips-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/Target/Mips/Disassembler/Android.bp b/llvm/lib/Target/Mips/Disassembler/Android.bp
index 66118be649c8..edc8df42b675 100644
--- a/llvm/lib/Target/Mips/Disassembler/Android.bp
+++ b/llvm/lib/Target/Mips/Disassembler/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMMipsDisassembler",
+    name: "libLLVM15MipsDisassembler",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-mips-defaults",
+        "llvm15-lib-defaults",
+        "llvm15-mips-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/Target/Mips/InstPrinter/Android.bp b/llvm/lib/Target/Mips/InstPrinter/Android.bp
index 28483b68b1c3..8b088f1b9d48 100644
--- a/llvm/lib/Target/Mips/InstPrinter/Android.bp
+++ b/llvm/lib/Target/Mips/InstPrinter/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMMipsAsmPrinter",
+    name: "libLLVM15MipsAsmPrinter",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-mips-defaults",
+        "llvm15-lib-defaults",
+        "llvm15-mips-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/Target/Mips/MCTargetDesc/Android.bp b/llvm/lib/Target/Mips/MCTargetDesc/Android.bp
index cc06b28570b3..74c54d9f306d 100644
--- a/llvm/lib/Target/Mips/MCTargetDesc/Android.bp
+++ b/llvm/lib/Target/Mips/MCTargetDesc/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMMipsDesc",
+    name: "libLLVM15MipsDesc",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-mips-defaults",
+        "llvm15-lib-defaults",
+        "llvm15-mips-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/Target/Mips/TargetInfo/Android.bp b/llvm/lib/Target/Mips/TargetInfo/Android.bp
index 938c076197b8..92582527f462 100644
--- a/llvm/lib/Target/Mips/TargetInfo/Android.bp
+++ b/llvm/lib/Target/Mips/TargetInfo/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMMipsInfo",
+    name: "libLLVM15MipsInfo",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-mips-defaults",
+        "llvm15-lib-defaults",
+        "llvm15-mips-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/Target/X86/Android.bp b/llvm/lib/Target/X86/Android.bp
index 81cd0e7e3a75..e0abf42f687f 100644
--- a/llvm/lib/Target/X86/Android.bp
+++ b/llvm/lib/Target/X86/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMX86CodeGen",
+    name: "libLLVM15X86CodeGen",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-x86-defaults",
+        "llvm15-lib-defaults",
+        "llvm15-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: "llvm15-x86-defaults",
+    generated_headers: ["llvm15-gen-x86"],
+    static_libs: ["llvm15-x86-headers"],
 }
 
 cc_library_static {
-    name: "llvm-x86-headers",
+    name: "llvm15-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",
+llvm15_tblgen {
+    name: "llvm15-gen-x86",
     in: "X86.td",
     outs: [
         "X86GenAsmMatcher.inc",
diff --git a/llvm/lib/Target/X86/AsmParser/Android.bp b/llvm/lib/Target/X86/AsmParser/Android.bp
index 830e02bfd764..95d30cadfba2 100644
--- a/llvm/lib/Target/X86/AsmParser/Android.bp
+++ b/llvm/lib/Target/X86/AsmParser/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMX86AsmParser",
+    name: "libLLVM15X86AsmParser",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-x86-defaults",
+        "llvm15-lib-defaults",
+        "llvm15-x86-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/Target/X86/Disassembler/Android.bp b/llvm/lib/Target/X86/Disassembler/Android.bp
index 0ee2e5ecd3a5..1d5ca5c6790d 100644
--- a/llvm/lib/Target/X86/Disassembler/Android.bp
+++ b/llvm/lib/Target/X86/Disassembler/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMX86Disassembler",
+    name: "libLLVM15X86Disassembler",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-x86-defaults",
+        "llvm15-lib-defaults",
+        "llvm15-x86-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/Target/X86/InstPrinter/Android.bp b/llvm/lib/Target/X86/InstPrinter/Android.bp
index bd37b9e5f787..aaf1d797922f 100644
--- a/llvm/lib/Target/X86/InstPrinter/Android.bp
+++ b/llvm/lib/Target/X86/InstPrinter/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMX86AsmPrinter",
+    name: "libLLVM15X86AsmPrinter",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-x86-defaults",
+        "llvm15-lib-defaults",
+        "llvm15-x86-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/Target/X86/MCTargetDesc/Android.bp b/llvm/lib/Target/X86/MCTargetDesc/Android.bp
index 7eb5a6e5b8ae..362b4bf0529f 100644
--- a/llvm/lib/Target/X86/MCTargetDesc/Android.bp
+++ b/llvm/lib/Target/X86/MCTargetDesc/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMX86Desc",
+    name: "libLLVM15X86Desc",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-x86-defaults",
+        "llvm15-lib-defaults",
+        "llvm15-x86-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/Target/X86/TargetInfo/Android.bp b/llvm/lib/Target/X86/TargetInfo/Android.bp
index a1a2f5c331f1..74d91fab9879 100644
--- a/llvm/lib/Target/X86/TargetInfo/Android.bp
+++ b/llvm/lib/Target/X86/TargetInfo/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMX86Info",
+    name: "libLLVM15X86Info",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-x86-defaults",
+        "llvm15-lib-defaults",
+        "llvm15-x86-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/Target/X86/Utils/Android.bp b/llvm/lib/Target/X86/Utils/Android.bp
index 30d8ec19c57b..f65ffc6f0e4a 100644
--- a/llvm/lib/Target/X86/Utils/Android.bp
+++ b/llvm/lib/Target/X86/Utils/Android.bp
@@ -1,8 +1,8 @@
 cc_library_static {
-    name: "libLLVMX86Utils",
+    name: "libLLVM15X86Utils",
     defaults: [
-        "llvm-lib-defaults",
-        "llvm-x86-defaults",
+        "llvm15-lib-defaults",
+        "llvm15-x86-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/TextAPI/Android.bp b/llvm/lib/TextAPI/Android.bp
index 5214440e6d03..acd495651a0b 100644
--- a/llvm/lib/TextAPI/Android.bp
+++ b/llvm/lib/TextAPI/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMTextAPI",
+    name: "libLLVM15TextAPI",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm15-lib-defaults",
     ],
     srcs: [
         "*.cpp",
diff --git a/llvm/lib/ToolDrivers/llvm-lib/Android.bp b/llvm/lib/ToolDrivers/llvm-lib/Android.bp
index d33020bd7d02..04fd998fdb30 100644
--- a/llvm/lib/ToolDrivers/llvm-lib/Android.bp
+++ b/llvm/lib/ToolDrivers/llvm-lib/Android.bp
@@ -1,14 +1,14 @@
 cc_library_static {
-    name: "libLLVMLibDriver",
+    name: "libLLVM15LibDriver",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm15-lib-defaults",
     ],
-    generated_headers: ["llvm-gen-libdriver"],
+    generated_headers: ["llvm15-gen-libdriver"],
     srcs: ["*.cpp"],
 }
 
-llvm_tblgen {
-    name: "llvm-gen-libdriver",
+llvm15_tblgen {
+    name: "llvm15-gen-libdriver",
     in: "Options.td",
     outs: ["Options.inc"],
 }
diff --git a/llvm/lib/Transforms/AggressiveInstCombine/Android.bp b/llvm/lib/Transforms/AggressiveInstCombine/Android.bp
index b2c12fc2ff4d..1c1908b188af 100644
--- a/llvm/lib/Transforms/AggressiveInstCombine/Android.bp
+++ b/llvm/lib/Transforms/AggressiveInstCombine/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMAggressiveInstCombine",
+    name: "libLLVM15AggressiveInstCombine",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm15-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/Transforms/CFGuard/Android.bp b/llvm/lib/Transforms/CFGuard/Android.bp
index 6686e5fe9f35..c78bcc4df8ab 100644
--- a/llvm/lib/Transforms/CFGuard/Android.bp
+++ b/llvm/lib/Transforms/CFGuard/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMCFGuard",
+    name: "libLLVM15CFGuard",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm15-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/Transforms/Coroutines/Android.bp b/llvm/lib/Transforms/Coroutines/Android.bp
index 8d1becadc6da..d87395df6ba4 100644
--- a/llvm/lib/Transforms/Coroutines/Android.bp
+++ b/llvm/lib/Transforms/Coroutines/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMCoroutines",
+    name: "libLLVM15Coroutines",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm15-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/Transforms/Hello/Android.bp b/llvm/lib/Transforms/Hello/Android.bp
index 64e2e6d35e11..834c0e918a83 100644
--- a/llvm/lib/Transforms/Hello/Android.bp
+++ b/llvm/lib/Transforms/Hello/Android.bp
@@ -1,7 +1,7 @@
 cc_library_host_shared {
-    name: "LLVMHello",
+    name: "LLVM15Hello",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm15-lib-defaults",
     ],
     srcs: ["*.cpp"],
     allow_undefined_symbols: true,
diff --git a/llvm/lib/Transforms/HelloNew/Android.bp b/llvm/lib/Transforms/HelloNew/Android.bp
index 54ddf0f4f7bd..dfa96198593b 100644
--- a/llvm/lib/Transforms/HelloNew/Android.bp
+++ b/llvm/lib/Transforms/HelloNew/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMHelloNew",
+    name: "libLLVM15HelloNew",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm15-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/Transforms/IPO/Android.bp b/llvm/lib/Transforms/IPO/Android.bp
index 644cee12ce2e..0ba8e757b2df 100644
--- a/llvm/lib/Transforms/IPO/Android.bp
+++ b/llvm/lib/Transforms/IPO/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMipo",
+    name: "libLLVM15ipo",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm15-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/Transforms/InstCombine/Android.bp b/llvm/lib/Transforms/InstCombine/Android.bp
index dfcc7ca139c1..0bb76f0389b3 100644
--- a/llvm/lib/Transforms/InstCombine/Android.bp
+++ b/llvm/lib/Transforms/InstCombine/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMInstCombine",
+    name: "libLLVM15InstCombine",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm15-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/Transforms/Instrumentation/Android.bp b/llvm/lib/Transforms/Instrumentation/Android.bp
index b719f1758bfe..ee57cb4b6bf6 100644
--- a/llvm/lib/Transforms/Instrumentation/Android.bp
+++ b/llvm/lib/Transforms/Instrumentation/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMInstrumentation",
+    name: "libLLVM15Instrumentation",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm15-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/Transforms/ObjCARC/Android.bp b/llvm/lib/Transforms/ObjCARC/Android.bp
index 64bc52982afc..3af794c70035 100644
--- a/llvm/lib/Transforms/ObjCARC/Android.bp
+++ b/llvm/lib/Transforms/ObjCARC/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMTransformObjCARC",
+    name: "libLLVM15TransformObjCARC",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm15-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/Transforms/Scalar/Android.bp b/llvm/lib/Transforms/Scalar/Android.bp
index 42e1eb880b88..87664e6481d4 100644
--- a/llvm/lib/Transforms/Scalar/Android.bp
+++ b/llvm/lib/Transforms/Scalar/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMScalarOpts",
+    name: "libLLVM15ScalarOpts",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm15-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/Transforms/Utils/Android.bp b/llvm/lib/Transforms/Utils/Android.bp
index 8fcf7ef74bb1..8c979da516d4 100644
--- a/llvm/lib/Transforms/Utils/Android.bp
+++ b/llvm/lib/Transforms/Utils/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMTransformUtils",
+    name: "libLLVM15TransformUtils",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm15-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/lib/Transforms/Vectorize/Android.bp b/llvm/lib/Transforms/Vectorize/Android.bp
index 78b16851a385..75cf06460b91 100644
--- a/llvm/lib/Transforms/Vectorize/Android.bp
+++ b/llvm/lib/Transforms/Vectorize/Android.bp
@@ -1,7 +1,7 @@
 cc_library_static {
-    name: "libLLVMVectorize",
+    name: "libLLVM15Vectorize",
     defaults: [
-        "llvm-lib-defaults",
+        "llvm15-lib-defaults",
     ],
     srcs: ["*.cpp"],
 }
diff --git a/llvm/soong/Android.bp b/llvm/soong/Android.bp
index 5895945fe919..a72fbd68b44c 100644
--- a/llvm/soong/Android.bp
+++ b/llvm/soong/Android.bp
@@ -1,5 +1,5 @@
 bootstrap_go_package {
-    name: "soong-llvm",
+    name: "soong-llvm15",
     pkgPath: "android/soong/external/llvm-project/llvm",
     deps: [
         "blueprint",
diff --git a/llvm/soong/llvm.go b/llvm/soong/llvm.go
index 7ff99bdb6798..be709b93d574 100644
--- a/llvm/soong/llvm.go
+++ b/llvm/soong/llvm.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package llvm
+package llvm15
 
 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("llvm15_defaults", llvmDefaultsFactory)
+	android.RegisterModuleType("force_build_llvm15_components_defaults", forceBuildLlvmComponentsDefaultsFactory)
 }
 
 func llvmDefaultsFactory() android.Module {
diff --git a/llvm/soong/tblgen.go b/llvm/soong/tblgen.go
index 58594b02d6e3..ba58f0994501 100644
--- a/llvm/soong/tblgen.go
+++ b/llvm/soong/tblgen.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package llvm
+package llvm15
 
 import (
 	"path/filepath"
@@ -25,20 +25,20 @@ import (
 )
 
 func init() {
-	android.RegisterModuleType("llvm_tblgen", llvmTblgenFactory)
+	android.RegisterModuleType("llvm15_tblgen", llvm15TblgenFactory)
 }
 
 var (
-	pctx = android.NewPackageContext("android/soong/llvm")
+	pctx = android.NewPackageContext("android/soong/llvm15")
 
-	llvmTblgen = pctx.HostBinToolVariable("llvmTblgen", "llvm-tblgen")
+	llvm15Tblgen = pctx.HostBinToolVariable("llvm15Tblgen", "llvm15-tblgen")
 
-	tblgenRule = pctx.StaticRule("tblgenRule", blueprint.RuleParams{
+	tblgenRule15 = pctx.StaticRule("tblgenRule15", 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:     "${llvm15Tblgen} ${includes} ${generator} -d ${depfile} -o ${out} ${in}",
+		CommandDeps: []string{"${llvm15Tblgen}"},
+		Description: "LLVM15 TableGen $in => $out",
 		Restat:      true,
 	}, "includes", "depfile", "generator")
 )
@@ -74,7 +74,7 @@ func (t *tblgen) GenerateAndroidBuildActions(ctx android.ModuleContext) {
 		generator := outToGenerator(ctx, o)
 
 		ctx.ModuleBuild(pctx, android.ModuleBuildParams{
-			Rule:   tblgenRule,
+			Rule:   tblgenRule15,
 			Input:  in,
 			Output: out,
 			Args: map[string]string{
@@ -226,7 +226,7 @@ func (t *tblgen) GeneratedDeps() android.Paths {
 	return t.generatedHeaders
 }
 
-func llvmTblgenFactory() android.Module {
+func llvm15TblgenFactory() android.Module {
 	t := &tblgen{}
 	t.AddProperties(&t.properties)
 	android.InitAndroidModule(t)
diff --git a/llvm/tools/llvm-go/llvm-go.go b/llvm/tools/llvm-go/llvm-go.go
index dc928b89bb43..25d20d4d765f 100644
--- a/llvm/tools/llvm-go/llvm-go.go
+++ b/llvm/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, "llvm15-config")
 	}
 
 	cmd := exec.Command(configpath, args...)
@@ -141,7 +141,7 @@ func printConfig() {
 
 // This file is generated by llvm-go, do not edit.
 
-package llvm
+package llvm15
 
 /*
 #cgo CPPFLAGS: %s
diff --git a/llvm/utils/TableGen/Android.bp b/llvm/utils/TableGen/Android.bp
index 69d0487a592a..da5726440697 100644
--- a/llvm/utils/TableGen/Android.bp
+++ b/llvm/utils/TableGen/Android.bp
@@ -1,12 +1,12 @@
 cc_binary_host {
-    name: "llvm-tblgen",
-    defaults: ["llvm-defaults-no-generated-headers"],
+    name: "llvm15-tblgen",
+    defaults: ["llvm15-defaults-no-generated-headers"],
     srcs: ["*.cpp"],
 
     static_libs: [
-        "libLLVMTableGenGlobalISel",
-        "libLLVMTableGen",
-        "libLLVMSupport",
+        "libLLVM15TableGenGlobalISel",
+        "libLLVM15TableGen",
+        "libLLVM15Support",
     ],
 
     host_ldlibs: ["-lm"],
@@ -14,8 +14,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
+        // llvm15-defaults turns off host builds by default, turn it back on for
+        // modules that are used to build llvm15-tblgen
         host: {
             enabled: true,
         },
diff --git a/llvm/utils/TableGen/GlobalISel/Android.bp b/llvm/utils/TableGen/GlobalISel/Android.bp
index 6faf3eda5c78..1dffe997e377 100644
--- a/llvm/utils/TableGen/GlobalISel/Android.bp
+++ b/llvm/utils/TableGen/GlobalISel/Android.bp
@@ -1,10 +1,10 @@
 cc_library_static {
-    name: "libLLVMTableGenGlobalISel",
-    defaults: ["llvm-defaults-no-generated-headers"],
+    name: "libLLVM15TableGenGlobalISel",
+    defaults: ["llvm15-defaults-no-generated-headers"],
     srcs: ["*.cpp"],
 
     static_libs: [
-        "libLLVMSupport",
+        "libLLVM15Support",
     ],
 
     host_ldlibs: ["-lm"],
@@ -12,8 +12,8 @@ cc_library_static {
         windows: {
             enabled: false,
         },
-        // llvm-defaults turns off host builds by default, turn it back on for
-        // modules that are used to build llvm-tblgen
+        // llvm15-defaults turns off host builds by default, turn it back on for
+        // modules that are used to build llvm15-tblgen
         host: {
             enabled: true,
         },
diff --git a/llvm/utils/TableGen/tdtags b/llvm/utils/TableGen/tdtags
index a3fb0805e181..e8ffb9e3c6f9 100644
--- a/llvm/utils/TableGen/tdtags
+++ b/llvm/utils/TableGen/tdtags
@@ -351,7 +351,7 @@ LC_ALL=C
 export LC_ALL
 
 # Globals.
-TBLGEN=llvm-tblgen
+TBLGEN=llvm15-tblgen
 LLVM_SRC_ROOT=
 
 # Command options.