Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1fb75df authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh Committed by Chih-hung Hsieh
Browse files

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
parent 9a5db000

android_sdk/sdk_repo_host.go

+3 −2
Original line number Diff line number Diff line
@@ -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")

			}