commit 4704d29f47adc6f70eae01b1050f5e469ab4c15b
author Yifan Hong <elsk@google.com> Fri Feb 09 16:04:42 2024 -0800
committer Yifan Hong <elsk@google.com> Thu May 09 18:44:39 2024 -0700
tree d506d1a0e749ec54450bccd91f779090b1d7b0c9
parent 3bd47139ac0e3593d4707ac0eeb2d45aa7411b67

kleaf: clang: Add C++ to :includes/:binaries. (older versions)

This is so that these include directories are also
used when the corresponding NDK triple is not found
in sysroot.

Test: TH
Bug: 324206397
Change-Id: Ia4d27cfcb2e2a81f166fdd03120f7054f69b5cfa
Merged-In: I5c75ef0001809b6587ad0bac1773dfe1ad7434d1

clang-r475365b/BUILD.bazel

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