diff options
| author | 2022-08-09 21:37:48 -0700 | |
|---|---|---|
| committer | 2022-08-16 01:04:59 +0000 | |
| commit | d1fb75df9a27249adc86a4bad56bcef0214bb592 (patch) | |
| tree | ad8f84940609d45dd4a156808c727e8d8e6171e6 | |
| parent | 9a5db000daba8e266f1fb80029def655562961e9 (diff) | |
Make llvm-strip depend on both lib and lib64
* Old compilers look up lib64/libc++.so.1
* New compilers look up lib/libc++.so.1
Bug: 241836377
Test: lunch sdk-userdebug; make sdk_repo
Change-Id: I90e7df9875594a1257e582ef62bac5084f0f939d
| -rw-r--r-- | android_sdk/sdk_repo_host.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/android_sdk/sdk_repo_host.go b/android_sdk/sdk_repo_host.go index 280dae89c..f64674276 100644 --- a/android_sdk/sdk_repo_host.go +++ b/android_sdk/sdk_repo_host.go @@ -166,9 +166,10 @@ func (s *sdkRepoHost) GenerateAndroidBuildActions(ctx android.ModuleContext) { } } else { llvmStrip := config.ClangPath(ctx, "bin/llvm-strip") - llvmLib := config.ClangPath(ctx, "lib64/libc++.so.1") + llvmLib64 := config.ClangPath(ctx, "lib64/libc++.so.1") + llvmLib := config.ClangPath(ctx, "lib/libc++.so.1") for _, strip := range s.properties.Strip_files { - cmd := builder.Command().Tool(llvmStrip).ImplicitTool(llvmLib) + cmd := builder.Command().Tool(llvmStrip).ImplicitTool(llvmLib64).ImplicitTool(llvmLib) if !ctx.Windows() { cmd.Flag("-x") } |