AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix MIPS32r2 + DSP2 builders after NDK update.

Browse Source 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2141643002

TBR=djsollen@google.com

CQ_INCLUDE_TRYBOTS=client.skia.compile:Build-Ubuntu-GCC-MipsDSP2-Debug-Android-Trybot,Build-Ubuntu-GCC-MipsDSP2-Release-Android-Trybot

Review-Url: https://codereview.chromium.org/2141643002
This commit is contained in:
mtklein 2016-07-11 10:30:19 -07:00 committed by Commit bot
parent 63d14413be
commit f3bc76a12a
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
platform_tools/android/bin/utils/setup_toolchain.sh
View File

@ -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.