commit c653b84d05fb116dddafb3e1e9426d90c7f53a08
author Xin Li <delphij@google.com> Fri Jun 14 10:46:09 2024 -0700
committer Xin Li <delphij@google.com> Fri Jun 14 10:46:09 2024 -0700
tree be1108f9b936f6498763cb30022026d442ed7c13
parent bb5d5d3844223681fcd6d2301d01dc26d5985360
parent 316b27117996146c941dcf24df83190840173a56

Merge Android 14 QPR3 to AOSP main

Bug: 346855327
Merged-In: I04d1f9c103b9b19c4926f6451b72ea4875b71ac7
Change-Id: I90d8bfff54a2a68413c7a30a9486b9c3edf8effa

clang-r475365b/BUILD.bazel

diff --git a/clang-r475365b/BUILD.bazel b/clang-r475365b/BUILD.bazel
index 06e7548..35723f0 100644
--- a/clang-r475365b/BUILD.bazel
+++ b/clang-r475365b/BUILD.bazel
@@ -5,7 +5,6 @@
     srcs = glob([
         "bin/*",
         "lib/*",
-        "lib/x86_64-unknown-linux-gnu/*",
     ]),
 )
 
@@ -13,8 +12,6 @@
     name = "includes",
     srcs = glob([
         "lib/clang/*/include/**",
-        "include/c++/**",
-        "include/x86_64-unknown-linux-gnu/c++/**",
     ]),
 )
 

clang-r487747c/BUILD.bazel

diff --git a/clang-r487747c/BUILD.bazel b/clang-r487747c/BUILD.bazel
index 06e7548..35723f0 100644
--- a/clang-r487747c/BUILD.bazel
+++ b/clang-r487747c/BUILD.bazel
@@ -5,7 +5,6 @@
     srcs = glob([
         "bin/*",
         "lib/*",
-        "lib/x86_64-unknown-linux-gnu/*",
     ]),
 )
 
@@ -13,8 +12,6 @@
     name = "includes",
     srcs = glob([
         "lib/clang/*/include/**",
-        "include/c++/**",
-        "include/x86_64-unknown-linux-gnu/c++/**",
     ]),
 )
 

clang-r498229b/BUILD.bazel

diff --git a/clang-r498229b/BUILD.bazel b/clang-r498229b/BUILD.bazel
index 06e7548..35723f0 100644
--- a/clang-r498229b/BUILD.bazel
+++ b/clang-r498229b/BUILD.bazel
@@ -5,7 +5,6 @@
     srcs = glob([
         "bin/*",
         "lib/*",
-        "lib/x86_64-unknown-linux-gnu/*",
     ]),
 )
 
@@ -13,8 +12,6 @@
     name = "includes",
     srcs = glob([
         "lib/clang/*/include/**",
-        "include/c++/**",
-        "include/x86_64-unknown-linux-gnu/c++/**",
     ]),
 )