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

Unified Diff: platform_tools/android/bin/android_setup.sh

Issue 216793007: Fix the ninja build on mac to use nm/readelf from the Android toolchain instead of the host system. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 9 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/android_setup.sh
diff --git a/platform_tools/android/bin/android_setup.sh b/platform_tools/android/bin/android_setup.sh
index 7a44317e872d06c070a38d38acc8fea2f582ac6c..d29a07048bf8dfa99c20aa0f5227d09cdfce43f4 100755
--- a/platform_tools/android/bin/android_setup.sh
+++ b/platform_tools/android/bin/android_setup.sh
@@ -152,6 +152,13 @@ setup_toolchain() {
export RANLIB="$ANDROID_TOOLCHAIN_PREFIX-ranlib"
export OBJCOPY="$ANDROID_TOOLCHAIN_PREFIX-objcopy"
export STRIP="$ANDROID_TOOLCHAIN_PREFIX-strip"
+
+ # 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
+ ln -sf $ANDROID_TOOLCHAIN_PREFIX-nm $ANDROID_TOOLCHAIN/nm
+ ln -sf $ANDROID_TOOLCHAIN_PREFIX-readelf $ANDROID_TOOLCHAIN/readelf
+ export PATH=$ANDROID_TOOLCHAIN:$PATH
+
}
# Helper function to configure the GYP defines to the appropriate values
« 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