From df97a8ac9c8e575347608b6cb14b7ee5836be503 Mon Sep 17 00:00:00 2001 From: Yi Kong Date: Mon, 8 Jan 2018 18:10:35 +0000 Subject: [PATCH] Revert "Switch to llvm-ar (with crsD flags only)." This reverts commit 13bc31d6e180b7fd52e82d3013c5d6da57fd8c24. Bug: 71694982 Reason for revert: Broke Mac build Change-Id: I0da6866442ca9273dd329f0b82932f939b7f65ed --- cc/builder.go | 4 ++-- cc/makevars.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cc/builder.go b/cc/builder.go index a280ec51c..de85d6e7f 100644 --- a/cc/builder.go +++ b/cc/builder.go @@ -508,8 +508,8 @@ func TransformObjToStaticLib(ctx android.ModuleContext, objFiles android.Paths, return } - arCmd := "${config.ClangBin}/llvm-ar" - arFlags := "crsD" + arCmd := gccCmd(flags.toolchain, "ar") + arFlags := "crsPD" if flags.arFlags != "" { arFlags += " " + flags.arFlags } diff --git a/cc/makevars.go b/cc/makevars.go index 5faf2018c..0d2569adb 100644 --- a/cc/makevars.go +++ b/cc/makevars.go @@ -289,7 +289,7 @@ func makeVarsToolchain(ctx android.MakeVarsContext, secondPrefix string, if target.Os == android.Darwin { ctx.Strict(makePrefix+"AR", "${config.MacArPath}") } else { - ctx.Strict(makePrefix+"AR", "${config.ClangBin}/llvm-ar") + ctx.Strict(makePrefix+"AR", gccCmd(toolchain, "ar")) ctx.Strict(makePrefix+"READELF", gccCmd(toolchain, "readelf")) ctx.Strict(makePrefix+"NM", gccCmd(toolchain, "nm")) }