diff options
| author | 2023-02-16 06:37:33 +0000 | |
|---|---|---|
| committer | 2023-02-16 06:45:46 +0000 | |
| commit | 960f535d025231ac4ff12d13e382df25ef755247 (patch) | |
| tree | 3bcc274721267d9d742f3a17f3e6ee2b90fec007 | |
| parent | d1fb75df9a27249adc86a4bad56bcef0214bb592 (diff) | |
Revert "Make llvm-strip depend on both lib and lib64"
This reverts commit d1fb75df9a27249adc86a4bad56bcef0214bb592.
We have moved to lib directory only, this is no longer necessary. Updated the llvmLib to the proper directory.
Bug: 269398998
Change-Id: I9b1d529da0578a47c21e8b7eba3b458cb2801dce
| -rw-r--r-- | android_sdk/sdk_repo_host.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/android_sdk/sdk_repo_host.go b/android_sdk/sdk_repo_host.go index f64674276..61058df09 100644 --- a/android_sdk/sdk_repo_host.go +++ b/android_sdk/sdk_repo_host.go @@ -166,10 +166,9 @@ func (s *sdkRepoHost) GenerateAndroidBuildActions(ctx android.ModuleContext) { } } else { llvmStrip := config.ClangPath(ctx, "bin/llvm-strip") - llvmLib64 := config.ClangPath(ctx, "lib64/libc++.so.1") - llvmLib := config.ClangPath(ctx, "lib/libc++.so.1") + llvmLib := config.ClangPath(ctx, "lib/x86_64-unknown-linux-gnu/libc++.so.1") for _, strip := range s.properties.Strip_files { - cmd := builder.Command().Tool(llvmStrip).ImplicitTool(llvmLib64).ImplicitTool(llvmLib) + cmd := builder.Command().Tool(llvmStrip).ImplicitTool(llvmLib) if !ctx.Windows() { cmd.Flag("-x") } |