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

Side by Side 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2015 Google Inc. 1 # Copyright 2015 Google Inc.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 #!/bin/bash 6 #!/bin/bash
7 # 7 #
8 # setup_toolchain.sh: Sets toolchain environment variables used by other scripts . 8 # setup_toolchain.sh: Sets toolchain environment variables used by other scripts .
9 9
10 # Fail-fast if anything in the script fails. 10 # Fail-fast if anything in the script fails.
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 exportVar CXX "$CCACHE $ANDROID_TOOLCHAIN_PREFIX-clang++" 137 exportVar CXX "$CCACHE $ANDROID_TOOLCHAIN_PREFIX-clang++"
138 exportVar LINK "$CCACHE $ANDROID_TOOLCHAIN_PREFIX-clang" 138 exportVar LINK "$CCACHE $ANDROID_TOOLCHAIN_PREFIX-clang"
139 fi 139 fi
140 140
141 exportVar AR "$ANDROID_TOOLCHAIN_PREFIX-ar" 141 exportVar AR "$ANDROID_TOOLCHAIN_PREFIX-ar"
142 exportVar RANLIB "$ANDROID_TOOLCHAIN_PREFIX-ranlib" 142 exportVar RANLIB "$ANDROID_TOOLCHAIN_PREFIX-ranlib"
143 exportVar OBJCOPY "$ANDROID_TOOLCHAIN_PREFIX-objcopy" 143 exportVar OBJCOPY "$ANDROID_TOOLCHAIN_PREFIX-objcopy"
144 exportVar STRIP "$ANDROID_TOOLCHAIN_PREFIX-strip" 144 exportVar STRIP "$ANDROID_TOOLCHAIN_PREFIX-strip"
145 fi 145 fi
146 146
147 # GCC doesn't seem to put this on its include path when setting -march=mips32r2.
148 # Oddly, it does for mips32, mips32r3, and mips32r5, but it's gone again for mip s32r6.
149 # Clang's fine.
150 if [ "$USE_CLANG" != "true" ]; then
151 if [ "$ANDROID_ARCH" == "mips" ]; then
152 exportVar CXX_target "$CXX_target -isystem $ANDROID_TOOLCHAIN/include/c+ +/4.9.x/mipsel-linux-android"
153 fi
154 fi
155
147 # Create symlinks for nm & readelf and add them to the path so that the ninja 156 # Create symlinks for nm & readelf and add them to the path so that the ninja
148 # build uses them instead of attempting to use the one on the system. 157 # build uses them instead of attempting to use the one on the system.
149 # This is required to build using ninja on a Mac. 158 # This is required to build using ninja on a Mac.
150 if [ $HOST == "darwin" ]; then 159 if [ $HOST == "darwin" ]; then
151 ln -sf $ANDROID_TOOLCHAIN_PREFIX-nm $ANDROID_TOOLCHAIN/bin/nm 160 ln -sf $ANDROID_TOOLCHAIN_PREFIX-nm $ANDROID_TOOLCHAIN/bin/nm
152 ln -sf $ANDROID_TOOLCHAIN_PREFIX-readelf $ANDROID_TOOLCHAIN/bin/readelf 161 ln -sf $ANDROID_TOOLCHAIN_PREFIX-readelf $ANDROID_TOOLCHAIN/bin/readelf
153 ln -sf $ANDROID_TOOLCHAIN_PREFIX-as $ANDROID_TOOLCHAIN/bin/as 162 ln -sf $ANDROID_TOOLCHAIN_PREFIX-as $ANDROID_TOOLCHAIN/bin/as
154 fi 163 fi
155 164
156 exportVar PATH ${ANDROID_TOOLCHAIN}/bin:${PATH} 165 exportVar PATH ${ANDROID_TOOLCHAIN}/bin:${PATH}
OLDNEW
« 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