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

Commit df34caf8 authored by Cole Faust's avatar Cole Faust
Browse files

Add llvm-objcopy to android_sdk_repo_host's implicit tools 

llvm-strip is actually a symlink to llvm-objcopy. Since aosp/2850015,
rules must add both the symlink and the target of the symlink to
the sandbox to avoid a dangling symlink.

Fixes: 314994282
Test: m sdk sdk_repo dist
Change-Id: I72494596f3597e176222a44c822d0b12cdd4cde4
parent fe377774

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")

			}