Merge "Revert "Switch to llvm-ar (with crsD flags only)."" am: 8a832c3e6d

am: 59f8ed8df3

Change-Id: I14326de90d9a8d1401c343883faa754d394a1ef4

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
 	}

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