commit b9ee10440997b85570d8c1aa5c4106fb6b28cc2c
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue May 10 06:54:15 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue May 10 06:54:15 2022 +0000
tree 34058fb1a9de5911041aa9358af0056ec19e118a
parent 3f18fb8bb3559ab121d67c43838bf188c30c2005
parent 114ed567495a8a7775bb996df3ee22ff45c2db38

Snap for 8564071 from 114ed567495a8a7775bb996df3ee22ff45c2db38 to mainline-wifi-release

Change-Id: Id53cb1306801730039478b11beebd6f9acf2b721

Android.bp

diff --git a/Android.bp b/Android.bp
index e3d8c85..8e8fbe9 100644
--- a/Android.bp
+++ b/Android.bp
@@ -288,12 +288,16 @@
     },
 }
 
-subdirs = [
-    "lib",
-    "soong",
-    "utils/TableGen",
-    "tools/clang-check",
-    "tools/clang-format",
-    "tools/driver",
-    "tools/libclang",
-]
+genrule {
+    name: "renderscript-clang-include",
+    visibility: ["//development/build"],
+    tools: ["soong_zip"],
+    cmd: "$(location soong_zip) -o $(out) -P renderscript/clang-include " +
+        "-C $$(dirname $(location LICENSE.TXT))/lib/Headers -D $$(dirname $(location LICENSE.TXT))/lib/Headers " +
+        "-C $$(dirname $(location LICENSE.TXT)) -f $(location LICENSE.TXT)",
+    srcs: [
+        "lib/Headers/**/*",
+        "LICENSE.TXT",
+    ],
+    out: ["clang-include.zip"],
+}

include/clang/Basic/IdentifierTable.h

diff --git a/include/clang/Basic/IdentifierTable.h b/include/clang/Basic/IdentifierTable.h
index fffb504..c71df83 100644
--- a/include/clang/Basic/IdentifierTable.h
+++ b/include/clang/Basic/IdentifierTable.h
@@ -358,8 +358,8 @@
   /// change to it should be reflected here.
   void RecomputeNeedsHandleIdentifier() {
     NeedsHandleIdentifier =
-      (isPoisoned() | hasMacroDefinition() | isCPlusPlusOperatorKeyword() |
-       isExtensionToken() | isFutureCompatKeyword() || isOutOfDate() ||
+      (isPoisoned() || hasMacroDefinition() || isCPlusPlusOperatorKeyword() ||
+       isExtensionToken() || isFutureCompatKeyword() || isOutOfDate() ||
        isModulesImport());
   }
 };

lib/Android.bp

diff --git a/lib/Android.bp b/lib/Android.bp
index 99b29ff..6782f61 100644
--- a/lib/Android.bp
+++ b/lib/Android.bp
@@ -9,3 +9,9 @@
 }
 
 subdirs = ["*"]
+
+filegroup {
+    name: "rs_clang_headers",
+    srcs: ["Headers/*.h"],
+    path: "Headers",
+}