diff options
| author |  djsollen <djsollen@google.com> | 2014-07-17 14:00:57 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-07-17 14:00:57 -0700 |
| commit | 384b0202c040034ba1e8f2e3789a01e4b05a6a2b (patch) | |
| tree | 22fd8fb57d26325956c91dad6b4102f9d91fd157 /platform_tools/android | |
| parent | 05c4560ab36447895d510655f927fcf123330497 (diff) | |
Fix mac NDK builds
R=jvanverth@google.com, scroggo@google.com
Author: djsollen@google.com
Review URL: https://codereview.chromium.org/401613005
Diffstat (limited to 'platform_tools/android')
| -rwxr-xr-x | platform_tools/android/bin/utils/setup_toolchain.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/platform_tools/android/bin/utils/setup_toolchain.sh b/platform_tools/android/bin/utils/setup_toolchain.sh index 4476bb8a38..ef491506fc 100755 --- a/platform_tools/android/bin/utils/setup_toolchain.sh +++ b/platform_tools/android/bin/utils/setup_toolchain.sh @@ -39,7 +39,7 @@ function default_toolchain() { TOOLCHAIN_DIR=${SCRIPT_DIR}/../toolchains if [ $(uname) == "Darwin" ]; then verbose "Using Mac toolchain." - TOOLCHAIN_TYPE=ndk-r$NDK_REV-$ANDROID_ARCH-mac_v$API_LEVEL + TOOLCHAIN_TYPE=ndk-r$NDK_REV-$ANDROID_ARCH-darwin_v$API_LEVEL else verbose "Using Linux toolchain." TOOLCHAIN_TYPE=ndk-r$NDK_REV-$ANDROID_ARCH-linux_v$API_LEVEL @@ -98,4 +98,5 @@ exportVar STRIP "$ANDROID_TOOLCHAIN_PREFIX-strip" # This is required to build using ninja on a Mac. ln -sf $ANDROID_TOOLCHAIN_PREFIX-nm $ANDROID_TOOLCHAIN/nm ln -sf $ANDROID_TOOLCHAIN_PREFIX-readelf $ANDROID_TOOLCHAIN/readelf +ln -sf $ANDROID_TOOLCHAIN_PREFIX-as $ANDROID_TOOLCHAIN/as exportVar PATH $ANDROID_TOOLCHAIN:$PATH |