From 294f83960691096115379914d23890302d5e5e6c Mon Sep 17 00:00:00 2001 From: Yabin Cui Date: Wed, 7 Jun 2023 21:58:46 +0000 Subject: [PATCH] Update clang version to clang-r498229 Bug: 280683256 Test: presubmit Change-Id: Idd0e171f11e0a7f44c64744744505ddeaca6f2fd --- android_sdk/sdk_repo_host.go | 2 +- cc/config/global.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/android_sdk/sdk_repo_host.go b/android_sdk/sdk_repo_host.go index 9623a8bc4..7212a0740 100644 --- a/android_sdk/sdk_repo_host.go +++ b/android_sdk/sdk_repo_host.go @@ -166,7 +166,7 @@ func (s *sdkRepoHost) GenerateAndroidBuildActions(ctx android.ModuleContext) { } } else { llvmStrip := config.ClangPath(ctx, "bin/llvm-strip") - llvmLib := config.ClangPath(ctx, "lib/x86_64-unknown-linux-gnu/libc++.so.1") + llvmLib := config.ClangPath(ctx, "lib/x86_64-unknown-linux-gnu/libc++.so") for _, strip := range s.properties.Strip_files { cmd := builder.Command().Tool(llvmStrip).ImplicitTool(llvmLib) if !ctx.Windows() { diff --git a/cc/config/global.go b/cc/config/global.go index d63e3242d..4ae6748f3 100644 --- a/cc/config/global.go +++ b/cc/config/global.go @@ -305,7 +305,7 @@ var ( // prebuilts/clang default settings. ClangDefaultBase = "prebuilts/clang/host" - ClangDefaultVersion = "clang-r487747c" + ClangDefaultVersion = "clang-r498229" ClangDefaultShortVersion = "17" // Directories with warnings from Android.bp files.