From 96ce8e71a3723ffc51ffb5be68e073cd542516d6 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Fri, 25 Jan 2019 17:00:45 -0800 Subject: [PATCH] Stop exporting the windows toolchain to Make Make no longer supports building for Windows, they must be in Android.bp files now. Bug: 122618577 Test: compare build-aosp_arm.ninja before/after Change-Id: Ie70d8519850da5b1bdddf73788f984eb3f4f0900 --- cc/makevars.go | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/cc/makevars.go b/cc/makevars.go index 32674a9d2..fb567babb 100644 --- a/cc/makevars.go +++ b/cc/makevars.go @@ -178,14 +178,6 @@ func makeVarsProvider(ctx android.MakeVarsContext) { makeVarsToolchain(ctx, "2ND_", hostTargets[1]) } - crossTargets := ctx.Config().Targets[android.Windows] - if len(crossTargets) > 0 { - makeVarsToolchain(ctx, "", crossTargets[0]) - if len(crossTargets) > 1 { - makeVarsToolchain(ctx, "2ND_", crossTargets[1]) - } - } - deviceTargets := ctx.Config().Targets[android.Android] makeVarsToolchain(ctx, "", deviceTargets[0]) if len(deviceTargets) > 1 { @@ -199,8 +191,6 @@ func makeVarsToolchain(ctx android.MakeVarsContext, secondPrefix string, switch target.Os.Class { case android.Host: typePrefix = "HOST_" - case android.HostCross: - typePrefix = "HOST_CROSS_" case android.Device: typePrefix = "TARGET_" } @@ -301,10 +291,6 @@ func makeVarsToolchain(ctx android.MakeVarsContext, secondPrefix string, ctx.Strict(makePrefix+"STRIP", gccCmd(toolchain, "strip")) } - if target.Os == android.Windows { - ctx.Strict(makePrefix+"OBJDUMP", gccCmd(toolchain, "objdump")) - } - if target.Os.Class == android.Device { ctx.Strict(makePrefix+"OBJCOPY", gccCmd(toolchain, "objcopy")) ctx.Strict(makePrefix+"LD", gccCmd(toolchain, "ld")) @@ -313,7 +299,7 @@ func makeVarsToolchain(ctx android.MakeVarsContext, secondPrefix string, ctx.Strict(makePrefix+"TOOLS_PREFIX", gccCmd(toolchain, "")) } - if target.Os.Class == android.Host || target.Os.Class == android.HostCross { + if target.Os.Class == android.Host { ctx.Strict(makePrefix+"AVAILABLE_LIBRARIES", strings.Join(toolchain.AvailableLibraries(), " ")) }