StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update clang version to clang-r498229" into main

Browse Source
This commit is contained in:
Yabin Cui
2023-07-06 23:54:42 +00:00
committed by Gerrit Code Review
parent 39381dc2bd 294f839606
commit f67bc44848
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android_sdk/sdk_repo_host.go
View File

@@ -166,7 +166,7 @@ func (s *sdkRepoHost) GenerateAndroidBuildActions(ctx android.ModuleContext) {
} }
} else { } else {
llvmStrip := config.ClangPath(ctx, "bin/llvm-strip") 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 { for _, strip := range s.properties.Strip_files {
cmd := builder.Command().Tool(llvmStrip).ImplicitTool(llvmLib) cmd := builder.Command().Tool(llvmStrip).ImplicitTool(llvmLib)
if !ctx.Windows() { if !ctx.Windows() {

2
cc/config/global.go
View File

@@ -305,7 +305,7 @@ var (
// prebuilts/clang default settings. // prebuilts/clang default settings.
ClangDefaultBase = "prebuilts/clang/host" ClangDefaultBase = "prebuilts/clang/host"
ClangDefaultVersion = "clang-r487747c" ClangDefaultVersion = "clang-r498229"
ClangDefaultShortVersion = "17" ClangDefaultShortVersion = "17"
// Directories with warnings from Android.bp files. // Directories with warnings from Android.bp files.