diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-03-25 12:29:42 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-03-25 12:29:42 +0000 |
| commit | 9d09467b8b60b3443d81dea6699c9f1a89fc371f (patch) | |
| tree | 34058fb1a9de5911041aa9358af0056ec19e118a | |
| parent | 9589e862113fa13d5f5ce0a770ae883e9e56df13 (diff) | |
| parent | 114ed567495a8a7775bb996df3ee22ff45c2db38 (diff) | |
| download | clang-android13-mainline-go-extservices-release.tar.gz | |
Snap for 8358640 from 114ed567495a8a7775bb996df3ee22ff45c2db38 to mainline-go-extservices-releaseaml_go_ext_330912000android13-mainline-go-extservices-release
Change-Id: Ifecdaa08e6e24f9c3e92c739736a4aba60b58edd
| -rw-r--r-- | Android.bp | 22 | ||||
| -rw-r--r-- | include/clang/Basic/IdentifierTable.h | 4 | ||||
| -rw-r--r-- | lib/Android.bp | 6 |
3 files changed, 21 insertions, 11 deletions
diff --git a/Android.bp b/Android.bp index e3d8c85b33..8e8fbe9726 100644 --- a/Android.bp +++ b/Android.bp @@ -288,12 +288,16 @@ cc_library_shared { }, } -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"], +} diff --git a/include/clang/Basic/IdentifierTable.h b/include/clang/Basic/IdentifierTable.h index fffb50493b..c71df832ac 100644 --- a/include/clang/Basic/IdentifierTable.h +++ b/include/clang/Basic/IdentifierTable.h @@ -358,8 +358,8 @@ private: /// change to it should be reflected here. void RecomputeNeedsHandleIdentifier() { NeedsHandleIdentifier = - (isPoisoned() | hasMacroDefinition() | isCPlusPlusOperatorKeyword() | - isExtensionToken() | isFutureCompatKeyword() || isOutOfDate() || + (isPoisoned() || hasMacroDefinition() || isCPlusPlusOperatorKeyword() || + isExtensionToken() || isFutureCompatKeyword() || isOutOfDate() || isModulesImport()); } }; diff --git a/lib/Android.bp b/lib/Android.bp index 99b29fff05..6782f61fb5 100644 --- a/lib/Android.bp +++ b/lib/Android.bp @@ -9,3 +9,9 @@ package { } subdirs = ["*"] + +filegroup { + name: "rs_clang_headers", + srcs: ["Headers/*.h"], + path: "Headers", +} |