Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(267)

Unified Diff: platform_tools/android/bin/utils/setup_toolchain.sh

Issue 2141643002: Fix MIPS32r2 + DSP2 builders after NDK update. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: platform_tools/android/bin/utils/setup_toolchain.sh
diff --git a/platform_tools/android/bin/utils/setup_toolchain.sh b/platform_tools/android/bin/utils/setup_toolchain.sh
index ebeab27a5031bcf0d89694134fc8d287d9dbd9fa..c341c2e341ac61538afcc90037ee0767308cb98d 100755
--- a/platform_tools/android/bin/utils/setup_toolchain.sh
+++ b/platform_tools/android/bin/utils/setup_toolchain.sh
@@ -144,6 +144,15 @@ else
exportVar STRIP "$ANDROID_TOOLCHAIN_PREFIX-strip"
fi
+# GCC doesn't seem to put this on its include path when setting -march=mips32r2.
+# Oddly, it does for mips32, mips32r3, and mips32r5, but it's gone again for mips32r6.
+# Clang's fine.
+if [ "$USE_CLANG" != "true" ]; then
+ if [ "$ANDROID_ARCH" == "mips" ]; then
+ exportVar CXX_target "$CXX_target -isystem $ANDROID_TOOLCHAIN/include/c++/4.9.x/mipsel-linux-android"
+ fi
+fi
+
# Create symlinks for nm & readelf and add them to the path so that the ninja
# build uses them instead of attempting to use the one on the system.
# This is required to build using ninja on a Mac.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698