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

Fix android scripts now that the $HOST is always lowercase.

Browse Source 
BUG=skia:5309
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1992873003

Review-Url: https://codereview.chromium.org/1992873003
This commit is contained in:
djsollen 2016-05-20 07:03:17 -07:00 committed by Commit bot
parent 0152d731e0
commit 3be9923105
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -102,7 +102,7 @@ CCACHE=${ANDROID_MAKE_CCACHE-$(which ccache || true)}
# variants for local development, but shipping versions of Skia # variants for local development, but shipping versions of Skia
# should be compiled on Linux for performance reasons. # should be compiled on Linux for performance reasons.
# TODO (msarett): Collect more information about this. # TODO (msarett): Collect more information about this.
if [ $(uname) == "Linux" ]; then if [ $HOST == "linux" ]; then
if [ "$USE_CLANG" != "true" ]; then if [ "$USE_CLANG" != "true" ]; then
exportVar CC_target "$CCACHE $ANDROID_TOOLCHAIN_PREFIX-gcc" exportVar CC_target "$CCACHE $ANDROID_TOOLCHAIN_PREFIX-gcc"
exportVar CXX_target "$CCACHE $ANDROID_TOOLCHAIN_PREFIX-g++" exportVar CXX_target "$CCACHE $ANDROID_TOOLCHAIN_PREFIX-g++"
@ -147,10 +147,10 @@ fi
# Create symlinks for nm & readelf and add them to the path so that the ninja # 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. # build uses them instead of attempting to use the one on the system.
# This is required to build using ninja on a Mac. # This is required to build using ninja on a Mac.
if [ $(uname) == "Darwin" ]; then if [ $HOST == "darwin" ]; then
ln -sf $ANDROID_TOOLCHAIN_PREFIX-nm $ANDROID_TOOLCHAIN/nm ln -sf $ANDROID_TOOLCHAIN_PREFIX-nm $ANDROID_TOOLCHAIN/bin/nm
ln -sf $ANDROID_TOOLCHAIN_PREFIX-readelf $ANDROID_TOOLCHAIN/readelf ln -sf $ANDROID_TOOLCHAIN_PREFIX-readelf $ANDROID_TOOLCHAIN/bin/readelf
ln -sf $ANDROID_TOOLCHAIN_PREFIX-as $ANDROID_TOOLCHAIN/as ln -sf $ANDROID_TOOLCHAIN_PREFIX-as $ANDROID_TOOLCHAIN/bin/as
fi fi
exportVar PATH ${ANDROID_TOOLCHAIN}/bin:${PATH} exportVar PATH ${ANDROID_TOOLCHAIN}/bin:${PATH}