Update makefiles after merge of Chromium at r209196

This commit was generated by merge_from_chromium.py.

Change-Id: I33d09d0ffc142904c1719c105e7593d3f11facbd

6 files changed, 0 insertions, 36 deletions

diff --git a/src/preprocessor.target.darwin-mips.mk b/src/preprocessor.target.darwin-mips.mk
index 96792053..6b7fcdd7 100644
--- a/src/preprocessor.target.darwin-mips.mk
+++ b/src/preprocessor.target.darwin-mips.mk
@@ -50,7 +50,6 @@ MY_CFLAGS_Debug := \
 	-Wno-format \
 	-EL \
 	-mhard-float \
-	--sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \
 	-ffunction-sections \
 	-funwind-tables \
 	-g \
@@ -132,7 +131,6 @@ MY_CFLAGS_Release := \
 	-Wno-format \
 	-EL \
 	-mhard-float \
-	--sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \
 	-ffunction-sections \
 	-funwind-tables \
 	-g \
@@ -211,8 +209,6 @@ LOCAL_LDFLAGS_Debug := \
 	-fPIC \
 	-EL \
 	-Wl,--no-keep-memory \
-	--sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \
-	 \
 	-nostdlib \
 	-Wl,--no-undefined \
 	-Wl,--exclude-libs=ALL \
@@ -228,8 +224,6 @@ LOCAL_LDFLAGS_Release := \
 	-fPIC \
 	-EL \
 	-Wl,--no-keep-memory \
-	--sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \
-	 \
 	-nostdlib \
 	-Wl,--no-undefined \
 	-Wl,--exclude-libs=ALL \
diff --git a/src/preprocessor.target.linux-mips.mk b/src/preprocessor.target.linux-mips.mk
index 96792053..6b7fcdd7 100644
--- a/src/preprocessor.target.linux-mips.mk
+++ b/src/preprocessor.target.linux-mips.mk
@@ -50,7 +50,6 @@ MY_CFLAGS_Debug := \
 	-Wno-format \
 	-EL \
 	-mhard-float \
-	--sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \
 	-ffunction-sections \
 	-funwind-tables \
 	-g \
@@ -132,7 +131,6 @@ MY_CFLAGS_Release := \
 	-Wno-format \
 	-EL \
 	-mhard-float \
-	--sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \
 	-ffunction-sections \
 	-funwind-tables \
 	-g \
@@ -211,8 +209,6 @@ LOCAL_LDFLAGS_Debug := \
 	-fPIC \
 	-EL \
 	-Wl,--no-keep-memory \
-	--sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \
-	 \
 	-nostdlib \
 	-Wl,--no-undefined \
 	-Wl,--exclude-libs=ALL \
@@ -228,8 +224,6 @@ LOCAL_LDFLAGS_Release := \
 	-fPIC \
 	-EL \
 	-Wl,--no-keep-memory \
-	--sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \
-	 \
 	-nostdlib \
 	-Wl,--no-undefined \
 	-Wl,--exclude-libs=ALL \
diff --git a/src/translator_common.target.darwin-mips.mk b/src/translator_common.target.darwin-mips.mk
index ed4a66a0..19445433 100644
--- a/src/translator_common.target.darwin-mips.mk
+++ b/src/translator_common.target.darwin-mips.mk
@@ -75,7 +75,6 @@ MY_CFLAGS_Debug := \
 	-Wno-format \
 	-EL \
 	-mhard-float \
-	--sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \
 	-ffunction-sections \
 	-funwind-tables \
 	-g \
@@ -160,7 +159,6 @@ MY_CFLAGS_Release := \
 	-Wno-format \
 	-EL \
 	-mhard-float \
-	--sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \
 	-ffunction-sections \
 	-funwind-tables \
 	-g \
@@ -242,8 +240,6 @@ LOCAL_LDFLAGS_Debug := \
 	-fPIC \
 	-EL \
 	-Wl,--no-keep-memory \
-	--sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \
-	 \
 	-nostdlib \
 	-Wl,--no-undefined \
 	-Wl,--exclude-libs=ALL \
@@ -259,8 +255,6 @@ LOCAL_LDFLAGS_Release := \
 	-fPIC \
 	-EL \
 	-Wl,--no-keep-memory \
-	--sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \
-	 \
 	-nostdlib \
 	-Wl,--no-undefined \
 	-Wl,--exclude-libs=ALL \
diff --git a/src/translator_common.target.linux-mips.mk b/src/translator_common.target.linux-mips.mk
index ed4a66a0..19445433 100644
--- a/src/translator_common.target.linux-mips.mk
+++ b/src/translator_common.target.linux-mips.mk
@@ -75,7 +75,6 @@ MY_CFLAGS_Debug := \
 	-Wno-format \
 	-EL \
 	-mhard-float \
-	--sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \
 	-ffunction-sections \
 	-funwind-tables \
 	-g \
@@ -160,7 +159,6 @@ MY_CFLAGS_Release := \
 	-Wno-format \
 	-EL \
 	-mhard-float \
-	--sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \
 	-ffunction-sections \
 	-funwind-tables \
 	-g \
@@ -242,8 +240,6 @@ LOCAL_LDFLAGS_Debug := \
 	-fPIC \
 	-EL \
 	-Wl,--no-keep-memory \
-	--sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \
-	 \
 	-nostdlib \
 	-Wl,--no-undefined \
 	-Wl,--exclude-libs=ALL \
@@ -259,8 +255,6 @@ LOCAL_LDFLAGS_Release := \
 	-fPIC \
 	-EL \
 	-Wl,--no-keep-memory \
-	--sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \
-	 \
 	-nostdlib \
 	-Wl,--no-undefined \
 	-Wl,--exclude-libs=ALL \
diff --git a/src/translator_glsl.target.darwin-mips.mk b/src/translator_glsl.target.darwin-mips.mk
index a4b399d2..3c3797d6 100644
--- a/src/translator_glsl.target.darwin-mips.mk
+++ b/src/translator_glsl.target.darwin-mips.mk
@@ -47,7 +47,6 @@ MY_CFLAGS_Debug := \
 	-Wno-format \
 	-EL \
 	-mhard-float \
-	--sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \
 	-ffunction-sections \
 	-funwind-tables \
 	-g \
@@ -132,7 +131,6 @@ MY_CFLAGS_Release := \
 	-Wno-format \
 	-EL \
 	-mhard-float \
-	--sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \
 	-ffunction-sections \
 	-funwind-tables \
 	-g \
@@ -214,8 +212,6 @@ LOCAL_LDFLAGS_Debug := \
 	-fPIC \
 	-EL \
 	-Wl,--no-keep-memory \
-	--sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \
-	 \
 	-nostdlib \
 	-Wl,--no-undefined \
 	-Wl,--exclude-libs=ALL \
@@ -231,8 +227,6 @@ LOCAL_LDFLAGS_Release := \
 	-fPIC \
 	-EL \
 	-Wl,--no-keep-memory \
-	--sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \
-	 \
 	-nostdlib \
 	-Wl,--no-undefined \
 	-Wl,--exclude-libs=ALL \
diff --git a/src/translator_glsl.target.linux-mips.mk b/src/translator_glsl.target.linux-mips.mk
index a4b399d2..3c3797d6 100644
--- a/src/translator_glsl.target.linux-mips.mk
+++ b/src/translator_glsl.target.linux-mips.mk
@@ -47,7 +47,6 @@ MY_CFLAGS_Debug := \
 	-Wno-format \
 	-EL \
 	-mhard-float \
-	--sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \
 	-ffunction-sections \
 	-funwind-tables \
 	-g \
@@ -132,7 +131,6 @@ MY_CFLAGS_Release := \
 	-Wno-format \
 	-EL \
 	-mhard-float \
-	--sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \
 	-ffunction-sections \
 	-funwind-tables \
 	-g \
@@ -214,8 +212,6 @@ LOCAL_LDFLAGS_Debug := \
 	-fPIC \
 	-EL \
 	-Wl,--no-keep-memory \
-	--sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \
-	 \
 	-nostdlib \
 	-Wl,--no-undefined \
 	-Wl,--exclude-libs=ALL \
@@ -231,8 +227,6 @@ LOCAL_LDFLAGS_Release := \
 	-fPIC \
 	-EL \
 	-Wl,--no-keep-memory \
-	--sysroot=/automerger/android-src/external/chromium_org/mipsel-sysroot/sysroot \
-	 \
 	-nostdlib \
 	-Wl,--no-undefined \
 	-Wl,--exclude-libs=ALL \