From 9598e1048a890810fc35b9655ee603a6994e8665 Mon Sep 17 00:00:00 2001
From: Dan Willemsen <dwillemsen@google.com>
Date: Thu, 19 May 2016 16:59:04 -0700
Subject: [PATCH] Stop sorting (C|CPP|LD)FLAGS when checking

Make isn't defining these anymore, so we don't need to sort them before
comparing.

Change-Id: Ia2f13f665309569ee8c564a8fb82639d174a83bb
---
 cc/makevars.go | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/cc/makevars.go b/cc/makevars.go
index 5259f5955..9ec917e7d 100644
--- a/cc/makevars.go
+++ b/cc/makevars.go
@@ -82,19 +82,19 @@ func makeVarsToolchain(ctx android.MakeVarsContext, secondPrefix string,
 		productExtraLdflags += "-static"
 	}
 
-	ctx.StrictSorted(makePrefix+"GLOBAL_CFLAGS", strings.Join([]string{
+	ctx.Strict(makePrefix+"GLOBAL_CFLAGS", strings.Join([]string{
 		toolchain.Cflags(),
 		"${commonGlobalCflags}",
 		fmt.Sprintf("${%sGlobalCflags}", hod),
 		toolchain.ToolchainCflags(),
 		productExtraCflags,
 	}, " "))
-	ctx.StrictSorted(makePrefix+"GLOBAL_CONLYFLAGS", "")
-	ctx.StrictSorted(makePrefix+"GLOBAL_CPPFLAGS", strings.Join([]string{
+	ctx.Strict(makePrefix+"GLOBAL_CONLYFLAGS", "")
+	ctx.Strict(makePrefix+"GLOBAL_CPPFLAGS", strings.Join([]string{
 		"${commonGlobalCppflags}",
 		toolchain.Cppflags(),
 	}, " "))
-	ctx.StrictSorted(makePrefix+"GLOBAL_LDFLAGS", strings.Join([]string{
+	ctx.Strict(makePrefix+"GLOBAL_LDFLAGS", strings.Join([]string{
 		toolchain.Ldflags(),
 		toolchain.ToolchainLdflags(),
 		productExtraLdflags,
@@ -123,7 +123,7 @@ func makeVarsToolchain(ctx android.MakeVarsContext, secondPrefix string,
 			clangExtras += " -B" + filepath.Join(toolchain.GccRoot(), toolchain.GccTriple(), "bin")
 		}
 
-		ctx.StrictSorted(clangPrefix+"GLOBAL_CFLAGS", strings.Join([]string{
+		ctx.Strict(clangPrefix+"GLOBAL_CFLAGS", strings.Join([]string{
 			toolchain.ClangCflags(),
 			"${commonClangGlobalCflags}",
 			fmt.Sprintf("${%sClangGlobalCflags}", hod),
@@ -131,12 +131,12 @@ func makeVarsToolchain(ctx android.MakeVarsContext, secondPrefix string,
 			clangExtras,
 			productExtraCflags,
 		}, " "))
-		ctx.StrictSorted(clangPrefix+"GLOBAL_CONLYFLAGS", "${clangExtraConlyflags}")
-		ctx.StrictSorted(clangPrefix+"GLOBAL_CPPFLAGS", strings.Join([]string{
+		ctx.Strict(clangPrefix+"GLOBAL_CONLYFLAGS", "${clangExtraConlyflags}")
+		ctx.Strict(clangPrefix+"GLOBAL_CPPFLAGS", strings.Join([]string{
 			"${commonClangGlobalCppflags}",
 			toolchain.ClangCppflags(),
 		}, " "))
-		ctx.StrictSorted(clangPrefix+"GLOBAL_LDFLAGS", strings.Join([]string{
+		ctx.Strict(clangPrefix+"GLOBAL_LDFLAGS", strings.Join([]string{
 			toolchain.ClangLdflags(),
 			toolchain.ToolchainClangLdflags(),
 			productExtraLdflags,