Browse Source

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
Chih-Hung Hsieh 1 year ago
parent
commit
d1fb75df9a
1 changed files with 3 additions and 2 deletions
  1. 3 2
      android_sdk/sdk_repo_host.go

+ 3 - 2
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")
 			}