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

Commit a1464c8e authored by Peter Collingbourne's avatar Peter Collingbourne Committed by android-build-merger
Browse files

Merge "Use LLD for partialLd." am: 2e16e2d9 am: d0ae5425 

am: 030e5780

Change-Id: I3e2a025c74ea5646bb4db481373f023a547d473a
parents c9513de0 030e5780

cc/builder.go

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ var ( 
		blueprint.RuleParams{

			// Without -no-pie, clang 7.0 adds -pie to link Android files,

			// but -r and -pie cannot be used together.

			Command:     "$ldCmd -nostdlib -no-pie -Wl,-r ${in} -o ${out} ${ldFlags}",

			Command:     "$ldCmd -fuse-ld=lld -nostdlib -no-pie -Wl,-r ${in} -o ${out} ${ldFlags}",

			CommandDeps: []string{"$ldCmd"},

		},

		"ldCmd", "ldFlags")