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

Commit ae4898e3 authored by Cole Faust's avatar Cole Faust Committed by Automerger Merge Worker
Browse files

Add llvm-objcopy to android_sdk_repo_host's implicit tools am: df34caf8 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2860767



Change-Id: I84b8348e64fd2462ee241c8411b12428c0ed0a05
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4b971d70 df34caf8

android_sdk/sdk_repo_host.go

+2 −1
Original line number Diff line number Diff line
@@ -165,10 +165,11 @@ func (s *sdkRepoHost) GenerateAndroidBuildActions(ctx android.ModuleContext) { 
				Flag(dir.Join(ctx, strip).String())

		}

	} else {

		llvmObjCopy := config.ClangPath(ctx, "bin/llvm-objcopy")

		llvmStrip := config.ClangPath(ctx, "bin/llvm-strip")

		llvmLib := config.ClangPath(ctx, "lib/x86_64-unknown-linux-gnu/libc++.so")

		for _, strip := range s.properties.Strip_files {

			cmd := builder.Command().Tool(llvmStrip).ImplicitTool(llvmLib)

			cmd := builder.Command().Tool(llvmStrip).ImplicitTool(llvmLib).ImplicitTool(llvmObjCopy)

			if !ctx.Windows() {

				cmd.Flag("-x")

			}