Snap for 7550930 from e1258daf2fadde69249612f3f447b6841abdb4b2 to mainline-captiveportallogin-releaseandroid-mainline-12.0.0_r6android-mainline-12.0.0_r23android12-mainline-captiveportallogin-release

Change-Id: Idf8e4cf68f56906f29ee13173aff849208b15229

92 files changed, 851 insertions, 54 deletions

diff --git a/Android.bp b/Android.bp
index 432340a9e92d..cbc59cb04a2d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,3 +1,47 @@
+package {
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
+// Added automatically by a large-scale-change that took the approach of
+// 'apply every license found to every target'. While this makes sure we respect
+// every license restriction, it may not be entirely correct.
+//
+// e.g. GPL in an MIT project might only apply to the contrib/ directory.
+//
+// Please consider splitting the single license below into multiple licenses,
+// taking care not to lose any license_kind information, and overriding the
+// default license using the 'licenses: [...]' property on targets as needed.
+//
+// For unused files, consider creating a 'fileGroup' with "//visibility:private"
+// to attach the license to, and including a comment whether the files may be
+// used in the current project.
+//
+// large-scale-change included anything that looked like it might be a license
+// text as a license_text. e.g. LICENSE, NOTICE, COPYING etc.
+//
+// Please consider removing redundant or irrelevant files from 'license_text:'.
+//
+// large-scale-change filtered out the below license kinds as false-positives:
+//   SPDX-license-identifier-GPL
+//   SPDX-license-identifier-GPL-3.0
+// See: http://go/android-license-faq
+license {
+    name: "external_llvm_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+        "SPDX-license-identifier-BSD",
+        "SPDX-license-identifier-MIT",
+        "SPDX-license-identifier-NCSA",
+        "legacy_permissive",
+        "legacy_unencumbered",
+    ],
+    license_text: [
+        "LICENSE.TXT",
+        "NOTICE",
+    ],
+}
+
 cc_defaults {
     name: "llvm-defaults",
     defaults: ["llvm-defaults-no-generated-headers"],
@@ -82,9 +126,7 @@ llvm_defaults {
             host_ldlibs: ["-luuid"],
         },
         linux_glibc: {
-            // Add on ncurses to have support for terminfo
             host_ldlibs: [
-                "-lncurses",
                 "-lgcc_s",
             ],
         },
@@ -93,11 +135,6 @@ llvm_defaults {
                 "-Wno-deprecated-declarations",
                 "-Woverloaded-virtual",
             ],
-
-            // Add on ncurses to have support for terminfo
-            host_ldlibs: [
-                "-lncurses",
-            ],
         },
     },
 }
@@ -105,6 +142,7 @@ llvm_defaults {
 cc_library_headers {
     name: "llvm-headers-no-generated-headers",
     vendor_available: true,
+    product_available: true,
     host_supported: true,
     // TODO(b/153609531): remove when no longer needed.
     native_bridge_supported: true,
@@ -128,6 +166,7 @@ cc_library_headers {
 cc_library_headers {
     name: "llvm-headers",
     vendor_available: true,
+    product_available: true,
     host_supported: true,
     // TODO(b/153609531): remove when no longer needed.
     native_bridge_supported: true,
@@ -210,6 +249,7 @@ cc_library {
     host_supported: true,
     name: "libLLVM_android",
     vendor_available: true,
+    product_available: true,
     defaults: [
         "llvm-defaults",
         "force_build_llvm_components",
@@ -295,12 +335,6 @@ cc_library {
                 llvm_arm_static_libraries +
                 llvm_aarch64_static_libraries,
         },
-        android_mips: {
-            whole_static_libs: llvm_mips_static_libraries,
-        },
-        android_mips64: {
-            whole_static_libs: llvm_mips_static_libraries,
-        },
         android_arm64: {
             whole_static_libs: llvm_aarch64_static_libraries +
                 llvm_arm_static_libraries,
diff --git a/METADATA b/METADATA
new file mode 100644
index 000000000000..d97975ca3b99
--- /dev/null
+++ b/METADATA
@@ -0,0 +1,3 @@
+third_party {
+  license_type: NOTICE
+}
diff --git a/README.version b/README.version
index 09d4b27f7809..6b48c7932990 100644
--- a/README.version
+++ b/README.version
@@ -1,4 +1,4 @@
 URL: http://llvm.org/git/llvm.git
-Version: Rolling from upstream + cherry-picks
+Version: r275480 + cherry-picks
 BugComponent: 117395
 Owners: srhines, android-llvm
diff --git a/host/include/llvm/Config/config.h b/host/include/llvm/Config/config.h
index 9563335abbd7..eb6c81d1ec1d 100644
--- a/host/include/llvm/Config/config.h
+++ b/host/include/llvm/Config/config.h
@@ -489,9 +489,7 @@
 #define HAVE_SYS_WAIT_H 1
 
 /* Define if the setupterm() function is supported this platform. */
-#ifndef __BIONIC__
-#define HAVE_TERMINFO 1
-#endif
+/* #undef HAVE_TERMINFO */
 
 /* Define to 1 if you have the <termios.h> header file. */
 #define HAVE_TERMIOS_H 1
diff --git a/include/llvm/Object/ELF.h b/include/llvm/Object/ELF.h
index 80b8be03810c..e00d34f160e7 100644
--- a/include/llvm/Object/ELF.h
+++ b/include/llvm/Object/ELF.h
@@ -109,11 +109,7 @@ public:
       Header->getDataEncoding() == ELF::ELFDATA2LSB;
   }
 
-  const Elf_Shdr *section_begin() const;
-  const Elf_Shdr *section_end() const;
-  Elf_Shdr_Range sections() const {
-    return makeArrayRef(section_begin(), section_end());
-  }
+  ErrorOr<Elf_Shdr_Range> sections() const;
 
   const Elf_Sym *symbol_begin(const Elf_Shdr *Sec) const {
     if (!Sec)
@@ -389,16 +385,12 @@ static bool compareAddr(uint64_t VAddr, const Elf_Phdr_Impl<ELFT> *Phdr) {
 }
 
 template <class ELFT>
-const typename ELFFile<ELFT>::Elf_Shdr *ELFFile<ELFT>::section_begin() const {
+ErrorOr<typename ELFT::ShdrRange> ELFFile<ELFT>::sections() const {
+  // Invalid section header entry size (e_shentsize) in ELF header
   if (Header->e_shentsize != sizeof(Elf_Shdr))
-    report_fatal_error(
-        "Invalid section header entry size (e_shentsize) in ELF header");
-  return reinterpret_cast<const Elf_Shdr *>(base() + Header->e_shoff);
-}
-
-template <class ELFT>
-const typename ELFFile<ELFT>::Elf_Shdr *ELFFile<ELFT>::section_end() const {
-  return section_begin() + getNumSections();
+    return object_error::parse_failed;
+  auto *Begin = reinterpret_cast<const Elf_Shdr *>(base() + Header->e_shoff);
+  return makeArrayRef(Begin, Begin + getNumSections());
 }
 
 template <class ELFT>
diff --git a/include/llvm/Object/ELFObjectFile.h b/include/llvm/Object/ELFObjectFile.h
index 6dcd2d486813..eaa0061ac074 100644
--- a/include/llvm/Object/ELFObjectFile.h
+++ b/include/llvm/Object/ELFObjectFile.h
@@ -262,7 +262,7 @@ protected:
     assert(SymTable->sh_type == ELF::SHT_SYMTAB ||
            SymTable->sh_type == ELF::SHT_DYNSYM);
 
-    uintptr_t SHT = reinterpret_cast<uintptr_t>(EF.section_begin());
+    uintptr_t SHT = reinterpret_cast<uintptr_t>((*EF.sections()).begin());
     unsigned SymTableIndex =
         (reinterpret_cast<uintptr_t>(SymTable) - SHT) / sizeof(Elf_Shdr);
 
@@ -627,7 +627,7 @@ template <class ELFT>
 relocation_iterator
 ELFObjectFile<ELFT>::section_rel_begin(DataRefImpl Sec) const {
   DataRefImpl RelData;
-  uintptr_t SHT = reinterpret_cast<uintptr_t>(EF.section_begin());
+  uintptr_t SHT = reinterpret_cast<uintptr_t>((*EF.sections()).begin());
   RelData.d.a = (Sec.p - SHT) / EF.getHeader()->e_shentsize;
   RelData.d.b = 0;
   return relocation_iterator(RelocationRef(RelData, this));
@@ -756,7 +756,10 @@ ELFObjectFile<ELFT>::ELFObjectFile(MemoryBufferRef Object, std::error_code &EC)
       EF(Data.getBuffer(), EC) {
   if (EC)
     return;
-  for (const Elf_Shdr &Sec : EF.sections()) {
+  auto SectionsOrErr = EF.sections();
+  if ((EC = SectionsOrErr.getError()))
+    return;
+  for (const Elf_Shdr &Sec : *SectionsOrErr) {
     switch (Sec.sh_type) {
     case ELF::SHT_DYNSYM: {
       if (DotDynSymSec) {
@@ -817,12 +820,12 @@ elf_symbol_iterator ELFObjectFile<ELFT>::dynamic_symbol_end() const {
 
 template <class ELFT>
 section_iterator ELFObjectFile<ELFT>::section_begin() const {
-  return section_iterator(SectionRef(toDRI(EF.section_begin()), this));
+  return section_iterator(SectionRef(toDRI((*EF.sections()).begin()), this));
 }
 
 template <class ELFT>
 section_iterator ELFObjectFile<ELFT>::section_end() const {
-  return section_iterator(SectionRef(toDRI(EF.section_end()), this));
+  return section_iterator(SectionRef(toDRI((*EF.sections()).end()), this));
 }
 
 template <class ELFT>
diff --git a/lib/Analysis/Android.bp b/lib/Analysis/Android.bp
index ffccb5a2e96b..b0364fe82f41 100644
--- a/lib/Analysis/Android.bp
+++ b/lib/Analysis/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_static {
     name: "libLLVMAnalysis",
     defaults: [
diff --git a/lib/Android.bp b/lib/Android.bp
index 5178d5cdcbcb..7c8ffd7c6a38 100644
--- a/lib/Android.bp
+++ b/lib/Android.bp
@@ -1,6 +1,20 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-BSD
+    //   SPDX-license-identifier-MIT
+    //   SPDX-license-identifier-NCSA
+    //   legacy_permissive
+    //   legacy_unencumbered
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_defaults {
     name: "llvm-lib-defaults",
     vendor_available: true,
+    product_available: true,
     defaults: ["llvm-defaults"],
     cflags: [
         "-W",
diff --git a/lib/AsmParser/Android.bp b/lib/AsmParser/Android.bp
index 3fff6b26b9ae..4b5b4392fea2 100644
--- a/lib/AsmParser/Android.bp
+++ b/lib/AsmParser/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_static {
     name: "libLLVMAsmParser",
     defaults: [
diff --git a/lib/Bitcode/Android.bp b/lib/Bitcode/Android.bp
index b44c2960127f..9afd1e908647 100644
--- a/lib/Bitcode/Android.bp
+++ b/lib/Bitcode/Android.bp
@@ -1 +1,10 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 subdirs = ["*"]
diff --git a/lib/Bitcode/Reader/Android.bp b/lib/Bitcode/Reader/Android.bp
index da7c543e214c..131e48514b69 100644
--- a/lib/Bitcode/Reader/Android.bp
+++ b/lib/Bitcode/Reader/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_static {
     name: "libLLVMBitReader",
     defaults: [
diff --git a/lib/Bitcode/Writer/Android.bp b/lib/Bitcode/Writer/Android.bp
index 754a252a7d80..d214c495a965 100644
--- a/lib/Bitcode/Writer/Android.bp
+++ b/lib/Bitcode/Writer/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_static {
     name: "libLLVMBitWriter",
     defaults: [
diff --git a/lib/CodeGen/Android.bp b/lib/CodeGen/Android.bp
index bcd447f6c52c..f7628075d160 100644
--- a/lib/CodeGen/Android.bp
+++ b/lib/CodeGen/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_static {
     name: "libLLVMCodeGen",
     defaults: [
diff --git a/lib/CodeGen/AsmPrinter/Android.bp b/lib/CodeGen/AsmPrinter/Android.bp
index d94c00ccdf54..9d0f769e94e4 100644
--- a/lib/CodeGen/AsmPrinter/Android.bp
+++ b/lib/CodeGen/AsmPrinter/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_static {
     name: "libLLVMAsmPrinter",
     defaults: [
diff --git a/lib/CodeGen/GlobalISel/Android.bp b/lib/CodeGen/GlobalISel/Android.bp
index 871be26c9213..b96815ef097e 100644
--- a/lib/CodeGen/GlobalISel/Android.bp
+++ b/lib/CodeGen/GlobalISel/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_static {
     name: "libLLVMGlobalISel",
     defaults: [
diff --git a/lib/CodeGen/MIRParser/Android.bp b/lib/CodeGen/MIRParser/Android.bp
index 4c68ec63b316..939f1fcd0430 100644
--- a/lib/CodeGen/MIRParser/Android.bp
+++ b/lib/CodeGen/MIRParser/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_static {
     name: "libLLVMMIRParser",
     defaults: [
diff --git a/lib/CodeGen/SelectionDAG/Android.bp b/lib/CodeGen/SelectionDAG/Android.bp
index 79c705aad151..48e8e53a9f91 100644
--- a/lib/CodeGen/SelectionDAG/Android.bp
+++ b/lib/CodeGen/SelectionDAG/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_static {
     name: "libLLVMSelectionDAG",
     defaults: [
diff --git a/lib/DebugInfo/Android.bp b/lib/DebugInfo/Android.bp
index b44c2960127f..9afd1e908647 100644
--- a/lib/DebugInfo/Android.bp
+++ b/lib/DebugInfo/Android.bp
@@ -1 +1,10 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 subdirs = ["*"]
diff --git a/lib/DebugInfo/CodeView/Android.bp b/lib/DebugInfo/CodeView/Android.bp
index 6abfae166597..a26ef43deabb 100644
--- a/lib/DebugInfo/CodeView/Android.bp
+++ b/lib/DebugInfo/CodeView/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_static {
     name: "libLLVMDebugInfoCodeView",
     defaults: [
diff --git a/lib/DebugInfo/DWARF/Android.bp b/lib/DebugInfo/DWARF/Android.bp
index c198e1f111bb..71e88eba623c 100644
--- a/lib/DebugInfo/DWARF/Android.bp
+++ b/lib/DebugInfo/DWARF/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_static {
     name: "libLLVMDebugInfoDWARF",
     defaults: [
diff --git a/lib/DebugInfo/PDB/Android.bp b/lib/DebugInfo/PDB/Android.bp
index f319ded207fc..f6294a28e517 100644
--- a/lib/DebugInfo/PDB/Android.bp
+++ b/lib/DebugInfo/PDB/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_static {
     name: "libLLVMDebugInfoPDB",
     defaults: [
diff --git a/lib/DebugInfo/Symbolize/Android.bp b/lib/DebugInfo/Symbolize/Android.bp
index c859f58a8abe..55e6e6ea98df 100644
--- a/lib/DebugInfo/Symbolize/Android.bp
+++ b/lib/DebugInfo/Symbolize/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_static {
     name: "libLLVMSymbolize",
     defaults: [
diff --git a/lib/ExecutionEngine/Android.bp b/lib/ExecutionEngine/Android.bp
index 41a44925ba89..b19df89686ac 100644
--- a/lib/ExecutionEngine/Android.bp
+++ b/lib/ExecutionEngine/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_static {
     name: "libLLVMExecutionEngine",
     defaults: [
diff --git a/lib/ExecutionEngine/Interpreter/Android.bp b/lib/ExecutionEngine/Interpreter/Android.bp
index 190a9a86c506..e119395074e7 100644
--- a/lib/ExecutionEngine/Interpreter/Android.bp
+++ b/lib/ExecutionEngine/Interpreter/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_static {
     name: "libLLVMInterpreter",
     defaults: [
diff --git a/lib/ExecutionEngine/MCJIT/Android.bp b/lib/ExecutionEngine/MCJIT/Android.bp
index 6b43bb17d026..3f6f303d6b0c 100644
--- a/lib/ExecutionEngine/MCJIT/Android.bp
+++ b/lib/ExecutionEngine/MCJIT/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_static {
     name: "libLLVMMCJIT",
     defaults: [
diff --git a/lib/ExecutionEngine/Orc/Android.bp b/lib/ExecutionEngine/Orc/Android.bp
index 1bb2faeaf80d..756c35c1d1d7 100644
--- a/lib/ExecutionEngine/Orc/Android.bp
+++ b/lib/ExecutionEngine/Orc/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_static {
     name: "libLLVMOrcJIT",
     defaults: [
diff --git a/lib/ExecutionEngine/RuntimeDyld/Android.bp b/lib/ExecutionEngine/RuntimeDyld/Android.bp
index 4042beaf1a1f..5dc50f99c039 100644
--- a/lib/ExecutionEngine/RuntimeDyld/Android.bp
+++ b/lib/ExecutionEngine/RuntimeDyld/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_static {
     name: "libLLVMRuntimeDyld",
     defaults: [
diff --git a/lib/Fuzzer/Android.bp b/lib/Fuzzer/Android.bp
index 709b73574942..c3a5a5e6f642 100644
--- a/lib/Fuzzer/Android.bp
+++ b/lib/Fuzzer/Android.bp
@@ -14,6 +14,16 @@
 // limitations under the License.
 //
 
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    //   legacy_unencumbered
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_static {
     name: "libLLVMFuzzerNoMain",
     host_supported: true,
diff --git a/lib/IR/Android.bp b/lib/IR/Android.bp
index 9bac320fd62a..390e6628e732 100644
--- a/lib/IR/Android.bp
+++ b/lib/IR/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_static {
     name: "libLLVMCore",
     defaults: [
diff --git a/lib/IRReader/Android.bp b/lib/IRReader/Android.bp
index a01a80fb828e..e27f75a38b85 100644
--- a/lib/IRReader/Android.bp
+++ b/lib/IRReader/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_static {
     name: "libLLVMIRReader",
     defaults: [
diff --git a/lib/LTO/Android.bp b/lib/LTO/Android.bp
index 928bd5c909bc..c0fdda0aff7b 100644
--- a/lib/LTO/Android.bp
+++ b/lib/LTO/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_static {
     name: "libLLVMLTO",
     defaults: [
diff --git a/lib/LibDriver/Android.bp b/lib/LibDriver/Android.bp
index d33020bd7d02..67c75819102a 100644
--- a/lib/LibDriver/Android.bp
+++ b/lib/LibDriver/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_static {
     name: "libLLVMLibDriver",
     defaults: [
diff --git a/lib/Linker/Android.bp b/lib/Linker/Android.bp
index a5e1a95359c4..55c924e8c8c5 100644
--- a/lib/Linker/Android.bp
+++ b/lib/Linker/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_static {
     name: "libLLVMLinker",
     defaults: [
diff --git a/lib/MC/Android.bp b/lib/MC/Android.bp
index 05e8445f7f96..c0b0dd6c2629 100644
--- a/lib/MC/Android.bp
+++ b/lib/MC/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_static {
     name: "libLLVMMC",
     defaults: [
diff --git a/lib/MC/MCDisassembler/Android.bp b/lib/MC/MCDisassembler/Android.bp
index c2f25fa3d220..feedb1082b00 100644
--- a/lib/MC/MCDisassembler/Android.bp
+++ b/lib/MC/MCDisassembler/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_static {
     name: "libLLVMMCDisassembler",
     defaults: [
diff --git a/lib/MC/MCParser/Android.bp b/lib/MC/MCParser/Android.bp
index cc7cd1f01358..af64b0c90394 100644
--- a/lib/MC/MCParser/Android.bp
+++ b/lib/MC/MCParser/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_static {
     name: "libLLVMMCParser",
     defaults: [
diff --git a/lib/Object/Android.bp b/lib/Object/Android.bp
index 37c88bd33b1c..d6c5a6a97846 100644
--- a/lib/Object/Android.bp
+++ b/lib/Object/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_static {
     name: "libLLVMObject",
     defaults: [
diff --git a/lib/ObjectYAML/Android.bp b/lib/ObjectYAML/Android.bp
index 17f4a6796b8e..bfdcec559292 100644
--- a/lib/ObjectYAML/Android.bp
+++ b/lib/ObjectYAML/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_static {
     name: "libLLVMObjectYAML",
     defaults: [
diff --git a/lib/Option/Android.bp b/lib/Option/Android.bp
index 035db4d7d483..86cd2234f418 100644
--- a/lib/Option/Android.bp
+++ b/lib/Option/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_static {
     name: "libLLVMOption",
     defaults: [
diff --git a/lib/Passes/Android.bp b/lib/Passes/Android.bp
index f98e1b66c8cd..17d7a2ff9f37 100644
--- a/lib/Passes/Android.bp
+++ b/lib/Passes/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_static {
     name: "libLLVMPasses",
     defaults: [
diff --git a/lib/ProfileData/Android.bp b/lib/ProfileData/Android.bp
index 710d5d406f15..9590021b7fe1 100644
--- a/lib/ProfileData/Android.bp
+++ b/lib/ProfileData/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_static {
     name: "libLLVMProfileData",
     defaults: [
diff --git a/lib/ProfileData/Coverage/Android.bp b/lib/ProfileData/Coverage/Android.bp
index 347c500133b9..1f82bebe197b 100644
--- a/lib/ProfileData/Coverage/Android.bp
+++ b/lib/ProfileData/Coverage/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_static {
     name: "libLLVMProfileDataCoverage",
     defaults: [
diff --git a/lib/Support/Android.bp b/lib/Support/Android.bp
index d00de3f26799..d095b3db6710 100644
--- a/lib/Support/Android.bp
+++ b/lib/Support/Android.bp
@@ -1,6 +1,39 @@
+package {
+    default_applicable_licenses: ["external_llvm_lib_Support_license"],
+}
+
+// Added automatically by a large-scale-change that took the approach of
+// 'apply every license found to every target'. While this makes sure we respect
+// every license restriction, it may not be entirely correct.
+//
+// e.g. GPL in an MIT project might only apply to the contrib/ directory.
+//
+// Please consider splitting the single license below into multiple licenses,
+// taking care not to lose any license_kind information, and overriding the
+// default license using the 'licenses: [...]' property on targets as needed.
+//
+// For unused files, consider creating a 'fileGroup' with "//visibility:private"
+// to attach the license to, and including a comment whether the files may be
+// used in the current project.
+// See: http://go/android-license-faq
+license {
+    name: "external_llvm_lib_Support_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-BSD",
+        "SPDX-license-identifier-MIT",
+        "SPDX-license-identifier-NCSA",
+        "legacy_unencumbered",
+    ],
+    license_text: [
+        "COPYRIGHT.regex",
+    ],
+}
+
 cc_library_static {
     name: "libLLVMSupport",
     vendor_available: true,
+    product_available: true,
     defaults: ["llvm-defaults-no-generated-headers"],
     target: {
         // llvm-defaults turns off host builds by default, turn it back on for
diff --git a/lib/TableGen/Android.bp b/lib/TableGen/Android.bp
index a9e06826bfd3..2e22afc97e3f 100644
--- a/lib/TableGen/Android.bp
+++ b/lib/TableGen/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_static {
     name: "libLLVMTableGen",
     defaults: ["llvm-defaults-no-generated-headers"],
diff --git a/lib/Target/AArch64/Android.bp b/lib/Target/AArch64/Android.bp
index 43110d29a9bc..6e651cfe21a8 100644
--- a/lib/Target/AArch64/Android.bp
+++ b/lib/Target/AArch64/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_static {
     name: "libLLVMAArch64CodeGen",
     defaults: [
@@ -23,6 +32,7 @@ cc_defaults {
 cc_library_static {
     name: "llvm-aarch64-headers",
     vendor_available: true,
+    product_available: true,
     host_supported: true,
     // TODO(b/153609531): remove when no longer needed.
     native_bridge_supported: true,
diff --git a/lib/Target/AArch64/AsmParser/Android.bp b/lib/Target/AArch64/AsmParser/Android.bp
index 9b409aec2c48..16f1c1b2c91b 100644
--- a/lib/Target/AArch64/AsmParser/Android.bp
+++ b/lib/Target/AArch64/AsmParser/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_static {
     name: "libLLVMAArch64AsmParser",
     defaults: [
diff --git a/lib/Target/AArch64/Disassembler/Android.bp b/lib/Target/AArch64/Disassembler/Android.bp
index e7a04d35e32f..ef9117d574f6 100644
--- a/lib/Target/AArch64/Disassembler/Android.bp
+++ b/lib/Target/AArch64/Disassembler/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_static {
     name: "libLLVMAArch64Disassembler",
     defaults: [
diff --git a/lib/Target/AArch64/InstPrinter/Android.bp b/lib/Target/AArch64/InstPrinter/Android.bp
index f1dac2a89f98..1246a4ef64f0 100644
--- a/lib/Target/AArch64/InstPrinter/Android.bp
+++ b/lib/Target/AArch64/InstPrinter/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_static {
     name: "libLLVMAArch64AsmPrinter",
     defaults: [
diff --git a/lib/Target/AArch64/MCTargetDesc/Android.bp b/lib/Target/AArch64/MCTargetDesc/Android.bp
index 9edc154a635c..2d51435010ec 100644
--- a/lib/Target/AArch64/MCTargetDesc/Android.bp
+++ b/lib/Target/AArch64/MCTargetDesc/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_static {
     name: "libLLVMAArch64Desc",
     defaults: [
diff --git a/lib/Target/AArch64/TargetInfo/Android.bp b/lib/Target/AArch64/TargetInfo/Android.bp
index baa98cad20fb..96d45b609559 100644
--- a/lib/Target/AArch64/TargetInfo/Android.bp
+++ b/lib/Target/AArch64/TargetInfo/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_static {
     name: "libLLVMAArch64Info",
     defaults: [
diff --git a/lib/Target/AArch64/Utils/Android.bp b/lib/Target/AArch64/Utils/Android.bp
index aa2db82bb61d..f407aef7a5c3 100644
--- a/lib/Target/AArch64/Utils/Android.bp
+++ b/lib/Target/AArch64/Utils/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_static {
     name: "libLLVMAArch64Utils",
     defaults: [
diff --git a/lib/Target/ARM/Android.bp b/lib/Target/ARM/Android.bp
index b54d89898d4f..59cbe130fcfd 100644
--- a/lib/Target/ARM/Android.bp
+++ b/lib/Target/ARM/Android.bp
@@ -1,3 +1,20 @@
+package {
+    default_applicable_licenses: ["external_llvm_lib_Target_ARM_license"],
+}
+
+// Added automatically by a large-scale-change
+// See: http://go/android-license-faq
+license {
+    name: "external_llvm_lib_Target_ARM_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-NCSA",
+    ],
+    license_text: [
+        "LICENSE.TXT",
+    ],
+}
+
 cc_library_static {
     name: "libLLVMARMCodeGen",
     defaults: [
@@ -22,6 +39,7 @@ cc_defaults {
 cc_library_static {
     name: "llvm-arm-headers",
     vendor_available: true,
+    product_available: true,
     host_supported: true,
     // TODO(b/153609531): remove when no longer needed.
     native_bridge_supported: true,
diff --git a/lib/Target/ARM/AsmParser/Android.bp b/lib/Target/ARM/AsmParser/Android.bp
index 3340db5a00f0..387d6072297e 100644
--- a/lib/Target/ARM/AsmParser/Android.bp
+++ b/lib/Target/ARM/AsmParser/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_lib_Target_ARM_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_lib_Target_ARM_license"],
+}
+
 cc_library_static {
     name: "libLLVMARMAsmParser",
     defaults: [
diff --git a/lib/Target/ARM/Disassembler/Android.bp b/lib/Target/ARM/Disassembler/Android.bp
index 8deda869ecb7..5d06dbd90c1c 100644
--- a/lib/Target/ARM/Disassembler/Android.bp
+++ b/lib/Target/ARM/Disassembler/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_lib_Target_ARM_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_lib_Target_ARM_license"],
+}
+
 cc_library_static {
     name: "libLLVMARMDisassembler",
     defaults: [
diff --git a/lib/Target/ARM/InstPrinter/Android.bp b/lib/Target/ARM/InstPrinter/Android.bp
index f54529f96cf2..5e80d816884b 100644
--- a/lib/Target/ARM/InstPrinter/Android.bp
+++ b/lib/Target/ARM/InstPrinter/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_lib_Target_ARM_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_lib_Target_ARM_license"],
+}
+
 cc_library_static {
     name: "libLLVMARMAsmPrinter",
     defaults: [
diff --git a/lib/Target/ARM/MCTargetDesc/Android.bp b/lib/Target/ARM/MCTargetDesc/Android.bp
index de05686195be..762d549ac318 100644
--- a/lib/Target/ARM/MCTargetDesc/Android.bp
+++ b/lib/Target/ARM/MCTargetDesc/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_lib_Target_ARM_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_lib_Target_ARM_license"],
+}
+
 cc_library_static {
     name: "libLLVMARMDesc",
     defaults: [
diff --git a/lib/Target/ARM/TargetInfo/Android.bp b/lib/Target/ARM/TargetInfo/Android.bp
index cfead24187b9..c52e801ceb46 100644
--- a/lib/Target/ARM/TargetInfo/Android.bp
+++ b/lib/Target/ARM/TargetInfo/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_lib_Target_ARM_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_lib_Target_ARM_license"],
+}
+
 cc_library_static {
     name: "libLLVMARMInfo",
     defaults: [
diff --git a/lib/Target/Android.bp b/lib/Target/Android.bp
index 5101e66259aa..b3a175dbdfce 100644
--- a/lib/Target/Android.bp
+++ b/lib/Target/Android.bp
@@ -1,3 +1,13 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    //   legacy_permissive
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_static {
     name: "libLLVMTarget",
     defaults: [
diff --git a/lib/Target/Mips/Android.bp b/lib/Target/Mips/Android.bp
index f8c1abffd912..5d67648a5236 100644
--- a/lib/Target/Mips/Android.bp
+++ b/lib/Target/Mips/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_static {
     name: "libLLVMMipsCodeGen",
     defaults: [
@@ -16,6 +25,7 @@ cc_defaults {
 cc_library_static {
     name: "llvm-mips-headers",
     vendor_available: true,
+    product_available: true,
     host_supported: true,
     // TODO(b/153609531): remove when no longer needed.
     native_bridge_supported: true,
diff --git a/lib/Target/Mips/AsmParser/Android.bp b/lib/Target/Mips/AsmParser/Android.bp
index b61dd02d9e0b..b74c618cbe21 100644
--- a/lib/Target/Mips/AsmParser/Android.bp
+++ b/lib/Target/Mips/AsmParser/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_static {
     name: "libLLVMMipsAsmParser",
     defaults: [
diff --git a/lib/Target/Mips/Disassembler/Android.bp b/lib/Target/Mips/Disassembler/Android.bp
index 66118be649c8..92b2f86b7766 100644
--- a/lib/Target/Mips/Disassembler/Android.bp
+++ b/lib/Target/Mips/Disassembler/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_static {
     name: "libLLVMMipsDisassembler",
     defaults: [
diff --git a/lib/Target/Mips/InstPrinter/Android.bp b/lib/Target/Mips/InstPrinter/Android.bp
index 28483b68b1c3..526d025c3910 100644
--- a/lib/Target/Mips/InstPrinter/Android.bp
+++ b/lib/Target/Mips/InstPrinter/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_static {
     name: "libLLVMMipsAsmPrinter",
     defaults: [
diff --git a/lib/Target/Mips/MCTargetDesc/Android.bp b/lib/Target/Mips/MCTargetDesc/Android.bp
index cc06b28570b3..1caaf0860a02 100644
--- a/lib/Target/Mips/MCTargetDesc/Android.bp
+++ b/lib/Target/Mips/MCTargetDesc/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_static {
     name: "libLLVMMipsDesc",
     defaults: [
diff --git a/lib/Target/Mips/TargetInfo/Android.bp b/lib/Target/Mips/TargetInfo/Android.bp
index 938c076197b8..4fd063bd9553 100644
--- a/lib/Target/Mips/TargetInfo/Android.bp
+++ b/lib/Target/Mips/TargetInfo/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_static {
     name: "libLLVMMipsInfo",
     defaults: [
diff --git a/lib/Target/X86/Android.bp b/lib/Target/X86/Android.bp
index 4e1b3f423cb9..05da45206fd2 100644
--- a/lib/Target/X86/Android.bp
+++ b/lib/Target/X86/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_static {
     name: "libLLVMX86CodeGen",
     defaults: [
@@ -23,6 +32,7 @@ cc_defaults {
 cc_library_static {
     name: "llvm-x86-headers",
     vendor_available: true,
+    product_available: true,
     host_supported: true,
     // TODO(b/153609531): remove when no longer needed.
     native_bridge_supported: true,
diff --git a/lib/Target/X86/AsmParser/Android.bp b/lib/Target/X86/AsmParser/Android.bp
index 830e02bfd764..86ca39624acf 100644
--- a/lib/Target/X86/AsmParser/Android.bp
+++ b/lib/Target/X86/AsmParser/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_static {
     name: "libLLVMX86AsmParser",
     defaults: [
diff --git a/lib/Target/X86/Disassembler/Android.bp b/lib/Target/X86/Disassembler/Android.bp
index 0ee2e5ecd3a5..4f37e24eb3cf 100644
--- a/lib/Target/X86/Disassembler/Android.bp
+++ b/lib/Target/X86/Disassembler/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_static {
     name: "libLLVMX86Disassembler",
     defaults: [
diff --git a/lib/Target/X86/InstPrinter/Android.bp b/lib/Target/X86/InstPrinter/Android.bp
index bd37b9e5f787..7514bf503826 100644
--- a/lib/Target/X86/InstPrinter/Android.bp
+++ b/lib/Target/X86/InstPrinter/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_static {
     name: "libLLVMX86AsmPrinter",
     defaults: [
diff --git a/lib/Target/X86/MCTargetDesc/Android.bp b/lib/Target/X86/MCTargetDesc/Android.bp
index 7eb5a6e5b8ae..2978ed9ac12e 100644
--- a/lib/Target/X86/MCTargetDesc/Android.bp
+++ b/lib/Target/X86/MCTargetDesc/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_static {
     name: "libLLVMX86Desc",
     defaults: [
diff --git a/lib/Target/X86/TargetInfo/Android.bp b/lib/Target/X86/TargetInfo/Android.bp
index a1a2f5c331f1..09bde48eee61 100644
--- a/lib/Target/X86/TargetInfo/Android.bp
+++ b/lib/Target/X86/TargetInfo/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_static {
     name: "libLLVMX86Info",
     defaults: [
diff --git a/lib/Target/X86/Utils/Android.bp b/lib/Target/X86/Utils/Android.bp
index 30d8ec19c57b..046897e8cd96 100644
--- a/lib/Target/X86/Utils/Android.bp
+++ b/lib/Target/X86/Utils/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_static {
     name: "libLLVMX86Utils",
     defaults: [
diff --git a/lib/Transforms/Android.bp b/lib/Transforms/Android.bp
index b44c2960127f..9afd1e908647 100644
--- a/lib/Transforms/Android.bp
+++ b/lib/Transforms/Android.bp
@@ -1 +1,10 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 subdirs = ["*"]
diff --git a/lib/Transforms/Hello/Android.bp b/lib/Transforms/Hello/Android.bp
index 64e2e6d35e11..e4ac1202abb6 100644
--- a/lib/Transforms/Hello/Android.bp
+++ b/lib/Transforms/Hello/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_host_shared {
     name: "LLVMHello",
     defaults: [
diff --git a/lib/Transforms/IPO/Android.bp b/lib/Transforms/IPO/Android.bp
index 644cee12ce2e..e0003bc8286c 100644
--- a/lib/Transforms/IPO/Android.bp
+++ b/lib/Transforms/IPO/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_static {
     name: "libLLVMipo",
     defaults: [
diff --git a/lib/Transforms/InstCombine/Android.bp b/lib/Transforms/InstCombine/Android.bp
index dfcc7ca139c1..153464753534 100644
--- a/lib/Transforms/InstCombine/Android.bp
+++ b/lib/Transforms/InstCombine/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_static {
     name: "libLLVMInstCombine",
     defaults: [
diff --git a/lib/Transforms/Instrumentation/Android.bp b/lib/Transforms/Instrumentation/Android.bp
index b719f1758bfe..2bbe17611d14 100644
--- a/lib/Transforms/Instrumentation/Android.bp
+++ b/lib/Transforms/Instrumentation/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_static {
     name: "libLLVMInstrumentation",
     defaults: [
diff --git a/lib/Transforms/ObjCARC/Android.bp b/lib/Transforms/ObjCARC/Android.bp
index 64bc52982afc..b9db93a0a0db 100644
--- a/lib/Transforms/ObjCARC/Android.bp
+++ b/lib/Transforms/ObjCARC/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_static {
     name: "libLLVMTransformObjCARC",
     defaults: [
diff --git a/lib/Transforms/Scalar/Android.bp b/lib/Transforms/Scalar/Android.bp
index 42e1eb880b88..ff8c46cce9af 100644
--- a/lib/Transforms/Scalar/Android.bp
+++ b/lib/Transforms/Scalar/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_static {
     name: "libLLVMScalarOpts",
     defaults: [
diff --git a/lib/Transforms/Utils/Android.bp b/lib/Transforms/Utils/Android.bp
index 8fcf7ef74bb1..18ebbfaf3043 100644
--- a/lib/Transforms/Utils/Android.bp
+++ b/lib/Transforms/Utils/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_static {
     name: "libLLVMTransformUtils",
     defaults: [
diff --git a/lib/Transforms/Vectorize/Android.bp b/lib/Transforms/Vectorize/Android.bp
index a9295523c4c3..524182262c74 100644
--- a/lib/Transforms/Vectorize/Android.bp
+++ b/lib/Transforms/Vectorize/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_library_static {
     name: "libLLVMVectorize",
     defaults: [
diff --git a/llvm-host-build.mk b/llvm-host-build.mk
index 89074a8d7760..956dad47dbec 100644
--- a/llvm-host-build.mk
+++ b/llvm-host-build.mk
@@ -55,9 +55,6 @@ LOCAL_C_INCLUDES :=	\
 	$(LLVM_ROOT_PATH)/host/include	\
 	$(LOCAL_C_INCLUDES)
 
-# Add on ncurses to have support for terminfo
-LOCAL_LDLIBS_darwin += -lncurses
-LOCAL_LDLIBS_linux += -lncurses
 LOCAL_LDLIBS_linux += -lgcc_s
 LOCAL_LDLIBS_windows += -luuid
 
diff --git a/soong/Android.bp b/soong/Android.bp
index fe886dcfe8bb..a384fc2a115b 100644
--- a/soong/Android.bp
+++ b/soong/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 bootstrap_go_package {
     name: "soong-llvm",
     pkgPath: "android/soong/external/llvm",
diff --git a/soong/llvm.go b/soong/llvm.go
index d1573bc454c3..edbc9cb95d5c 100644
--- a/soong/llvm.go
+++ b/soong/llvm.go
@@ -92,10 +92,14 @@ func forceBuildLlvmComponents(ctx android.LoadHookContext) {
 				Host struct {
 					Enabled *bool
 				}
+				Linux_bionic_arm64 struct {
+					Enabled *bool
+				}
 			}
 		}
 		p := &props{}
 		p.Target.Host.Enabled = proptools.BoolPtr(false)
+		p.Target.Linux_bionic_arm64.Enabled = proptools.BoolPtr(true)
 		ctx.AppendProperties(p)
 	}
 }
diff --git a/test/Object/invalid.test b/test/Object/invalid.test
index a32c621cca61..51bdee6f2784 100644
--- a/test/Object/invalid.test
+++ b/test/Object/invalid.test
@@ -45,7 +45,7 @@ RUN: not llvm-readobj -t %p/Inputs/invalid-section-index.elf 2>&1 | FileCheck --
 INVALID-SECTION-INDEX: Invalid section index
 
 RUN: not llvm-readobj -s %p/Inputs/invalid-section-size.elf 2>&1 | FileCheck --check-prefix=INVALID-SECTION-SIZE %s
-INVALID-SECTION-SIZE: Invalid section header entry size (e_shentsize) in ELF header
+INVALID-SECTION-SIZE: Invalid data was encountered while parsing the file
 
 
 RUN: not llvm-readobj -t %p/Inputs/invalid-symbol-table-size.elf 2>&1 | FileCheck --check-prefix=INVALID-SYMTAB-SIZE %s
diff --git a/tools/llvm-readobj/ARMEHABIPrinter.h b/tools/llvm-readobj/ARMEHABIPrinter.h
index 59c9b713d85e..a85f987def0c 100644
--- a/tools/llvm-readobj/ARMEHABIPrinter.h
+++ b/tools/llvm-readobj/ARMEHABIPrinter.h
@@ -379,7 +379,7 @@ PrinterContext<ET>::FindExceptionTable(unsigned IndexSectionIndex,
   /// handling table.  Use this symbol to recover the actual exception handling
   /// table.
 
-  for (const Elf_Shdr &Sec : ELF->sections()) {
+  for (const Elf_Shdr &Sec : unwrapOrError(ELF->sections())) {
     if (Sec.sh_type != ELF::SHT_REL || Sec.sh_info != IndexSectionIndex)
       continue;
 
@@ -548,7 +548,7 @@ void PrinterContext<ET>::PrintUnwindInformation() const {
   DictScope UI(SW, "UnwindInformation");
 
   int SectionIndex = 0;
-  for (const Elf_Shdr &Sec : ELF->sections()) {
+  for (const Elf_Shdr &Sec : unwrapOrError(ELF->sections())) {
     if (Sec.sh_type == ELF::SHT_ARM_EXIDX) {
       DictScope UIT(SW, "UnwindIndexTable");
 
diff --git a/tools/llvm-readobj/ELFDumper.cpp b/tools/llvm-readobj/ELFDumper.cpp
index 84e368e7aa36..eefcca8be32e 100644
--- a/tools/llvm-readobj/ELFDumper.cpp
+++ b/tools/llvm-readobj/ELFDumper.cpp
@@ -737,7 +737,7 @@ getSectionNameIndex(const ELFO &Obj, const typename ELFO::Elf_Sym *Symbol,
 template <class ELFO>
 static const typename ELFO::Elf_Shdr *
 findNotEmptySectionByAddress(const ELFO *Obj, uint64_t Addr) {
-  for (const auto &Shdr : Obj->sections())
+  for (const auto &Shdr : unwrapOrError(Obj->sections()))
     if (Shdr.sh_addr == Addr && Shdr.sh_size > 0)
       return &Shdr;
   return nullptr;
@@ -1318,7 +1318,7 @@ ELFDumper<ELFT>::ELFDumper(const ELFFile<ELFT> *Obj, ScopedPrinter &Writer)
     LoadSegments.push_back(&Phdr);
   }
 
-  for (const Elf_Shdr &Sec : Obj->sections()) {
+  for (const Elf_Shdr &Sec : unwrapOrError(Obj->sections())) {
     switch (Sec.sh_type) {
     case ELF::SHT_SYMTAB:
       if (DotSymtabSec != nullptr)
@@ -1851,7 +1851,7 @@ template <> void ELFDumper<ELFType<support::little, false>>::printAttributes() {
   }
 
   DictScope BA(W, "BuildAttributes");
-  for (const ELFO::Elf_Shdr &Sec : Obj->sections()) {
+  for (const ELFO::Elf_Shdr &Sec : unwrapOrError(Obj->sections())) {
     if (Sec.sh_type != ELF::SHT_ARM_ATTRIBUTES)
       continue;
 
@@ -2336,7 +2336,7 @@ template <class ELFT> void ELFDumper<ELFT>::printMipsOptions() {
 
 template <class ELFT> void ELFDumper<ELFT>::printStackMap() const {
   const Elf_Shdr *StackMapSection = nullptr;
-  for (const auto &Sec : Obj->sections()) {
+  for (const auto &Sec : unwrapOrError(Obj->sections())) {
     StringRef Name = unwrapOrError(Obj->getSectionName(&Sec));
     if (Name == ".llvm_stackmaps") {
       StackMapSection = &Sec;
@@ -2423,7 +2423,7 @@ template <class ELFT> void GNUStyle<ELFT>::printFileHeaders(const ELFO *Obj) {
 template <class ELFT> void GNUStyle<ELFT>::printGroupSections(const ELFO *Obj) {
   uint32_t SectionIndex = 0;
   bool HasGroups = false;
-  for (const Elf_Shdr &Sec : Obj->sections()) {
+  for (const Elf_Shdr &Sec : unwrapOrError(Obj->sections())) {
     if (Sec.sh_type == ELF::SHT_GROUP) {
       HasGroups = true;
       const Elf_Shdr *Symtab = unwrapOrError(Obj->getSection(Sec.sh_link));
@@ -2517,7 +2517,7 @@ static inline void printRelocHeader(raw_ostream &OS, bool Is64, bool IsRela) {
 
 template <class ELFT> void GNUStyle<ELFT>::printRelocations(const ELFO *Obj) {
   bool HasRelocSections = false;
-  for (const Elf_Shdr &Sec : Obj->sections()) {
+  for (const Elf_Shdr &Sec : unwrapOrError(Obj->sections())) {
     if (Sec.sh_type != ELF::SHT_REL && Sec.sh_type != ELF::SHT_RELA)
       continue;
     HasRelocSections = true;
@@ -2663,7 +2663,7 @@ template <class ELFT> void GNUStyle<ELFT>::printSections(const ELFO *Obj) {
     printField(f);
   OS << "\n";
 
-  for (const Elf_Shdr &Sec : Obj->sections()) {
+  for (const Elf_Shdr &Sec : unwrapOrError(Obj->sections())) {
     Number = to_string(SectionIndex);
     Fields[0].Str = Number;
     Fields[1].Str = unwrapOrError(Obj->getSectionName(&Sec));
@@ -2941,7 +2941,7 @@ void GNUStyle<ELFT>::printProgramHeaders(const ELFO *Obj) {
   for (const Elf_Phdr &Phdr : Obj->program_headers()) {
     std::string Sections;
     OS << format("   %2.2d     ", Phnum++);
-    for (const Elf_Shdr &Sec : Obj->sections()) {
+    for (const Elf_Shdr &Sec : unwrapOrError(Obj->sections())) {
       // Check if each section is in a segment and then print mapping.
       // readelf additionally makes sure it does not print zero sized sections
       // at end of segments and for PT_DYNAMIC both start and end of section
@@ -3209,7 +3209,7 @@ void LLVMStyle<ELFT>::printGroupSections(const ELFO *Obj) {
   DictScope Lists(W, "Groups");
   uint32_t SectionIndex = 0;
   bool HasGroups = false;
-  for (const Elf_Shdr &Sec : Obj->sections()) {
+  for (const Elf_Shdr &Sec : unwrapOrError(Obj->sections())) {
     if (Sec.sh_type == ELF::SHT_GROUP) {
       HasGroups = true;
       const Elf_Shdr *Symtab = unwrapOrError(Obj->getSection(Sec.sh_link));
@@ -3243,7 +3243,7 @@ template <class ELFT> void LLVMStyle<ELFT>::printRelocations(const ELFO *Obj) {
   ListScope D(W, "Relocations");
 
   int SectionNumber = -1;
-  for (const Elf_Shdr &Sec : Obj->sections()) {
+  for (const Elf_Shdr &Sec : unwrapOrError(Obj->sections())) {
     ++SectionNumber;
 
     if (Sec.sh_type != ELF::SHT_REL && Sec.sh_type != ELF::SHT_RELA)
@@ -3317,7 +3317,7 @@ template <class ELFT> void LLVMStyle<ELFT>::printSections(const ELFO *Obj) {
   ListScope SectionsD(W, "Sections");
 
   int SectionIndex = -1;
-  for (const Elf_Shdr &Sec : Obj->sections()) {
+  for (const Elf_Shdr &Sec : unwrapOrError(Obj->sections())) {
     ++SectionIndex;
 
     StringRef Name = unwrapOrError(Obj->getSectionName(&Sec));
diff --git a/tools/obj2yaml/elf2yaml.cpp b/tools/obj2yaml/elf2yaml.cpp
index 782832d54571..4f958e30bb67 100644
--- a/tools/obj2yaml/elf2yaml.cpp
+++ b/tools/obj2yaml/elf2yaml.cpp
@@ -72,7 +72,10 @@ ErrorOr<ELFYAML::Object *> ELFDumper<ELFT>::dump() {
   const Elf_Shdr *Symtab = nullptr;
 
   // Dump sections
-  for (const Elf_Shdr &Sec : Obj.sections()) {
+  auto SectionsOrErr = Obj.sections();
+  if (std::error_code EC = SectionsOrErr.getError())
+    return EC;
+  for (const Elf_Shdr &Sec : *SectionsOrErr) {
     switch (Sec.sh_type) {
     case ELF::SHT_NULL:
     case ELF::SHT_DYNSYM:
diff --git a/utils/FileCheck/Android.bp b/utils/FileCheck/Android.bp
index e21b9de8b968..6d528cd81521 100644
--- a/utils/FileCheck/Android.bp
+++ b/utils/FileCheck/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_binary_host {
     name: "FileCheck",
     defaults: ["llvm-defaults"],
diff --git a/utils/TableGen/Android.bp b/utils/TableGen/Android.bp
index 3c7e9932481c..337e3e79fedd 100644
--- a/utils/TableGen/Android.bp
+++ b/utils/TableGen/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_binary_host {
     name: "llvm-tblgen",
     defaults: ["llvm-defaults-no-generated-headers"],
diff --git a/utils/count/Android.bp b/utils/count/Android.bp
index 1d438093a66f..d4ea9325641c 100644
--- a/utils/count/Android.bp
+++ b/utils/count/Android.bp
@@ -2,6 +2,15 @@
 // count command line tool
 //===---------------------------------------------------------------===
 
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_binary_host {
     name: "count",
     defaults: ["llvm-defaults"],
diff --git a/utils/not/Android.bp b/utils/not/Android.bp
index 25a2f83e49ea..0d13ec99dc51 100644
--- a/utils/not/Android.bp
+++ b/utils/not/Android.bp
@@ -2,6 +2,15 @@
 // not command line tool
 //===---------------------------------------------------------------===
 
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_binary_host {
     name: "not",
     defaults: ["llvm-defaults"],
diff --git a/utils/yaml-bench/Android.bp b/utils/yaml-bench/Android.bp
index df5092fbc84e..0511deb0039d 100644
--- a/utils/yaml-bench/Android.bp
+++ b/utils/yaml-bench/Android.bp
@@ -1,6 +1,15 @@
 // yaml-bench executable for the host
 // =====================================================
 
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "external_llvm_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-NCSA
+    default_applicable_licenses: ["external_llvm_license"],
+}
+
 cc_binary_host {
     name: "yaml-bench",
     defaults: ["llvm-defaults"],