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

Unified Diff: build/android/envsetup_functions.sh

Issue 12613006: Android WebView: fix aidl on mac hosts. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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: build/android/envsetup_functions.sh
diff --git a/build/android/envsetup_functions.sh b/build/android/envsetup_functions.sh
index 7c7557aa5a44ab850dcc9cd9f22a7f6b977c37c3..5ad34b7b8e6d81fdc99bb53fd8615a7296fd3fec 100755
--- a/build/android/envsetup_functions.sh
+++ b/build/android/envsetup_functions.sh
@@ -270,10 +270,20 @@ ${ANDROID_SDK_VERSION}
ANDROID_SDK=$(python -c \
"import os.path; print os.path.relpath('${ANDROID_SDK_ROOT}', \
'${ANDROID_BUILD_TOP}')")
- ANDROID_SDK_TOOLS=$(python -c \
- "import os.path; \
- print os.path.relpath('${ANDROID_SDK_ROOT}/../tools/linux', \
- '${ANDROID_BUILD_TOP}')")
+ case "${host_os}" in
+ "linux")
+ ANDROID_SDK_TOOLS=$(python -c \
+ "import os.path; \
+ print os.path.relpath('${ANDROID_SDK_ROOT}/../tools/linux', \
+ '${ANDROID_BUILD_TOP}')")
+ ;;
+ "mac")
+ ANDROID_SDK_TOOLS=$(python -c \
+ "import os.path; \
+ print os.path.relpath('${ANDROID_SDK_ROOT}/../tools/darwin', \
+ '${ANDROID_BUILD_TOP}')")
+ ;;
+ esac
DEFINES+=" android_build_type=1"
DEFINES+=" android_src=\$(GYP_ABS_ANDROID_TOP_DIR)"
DEFINES+=" android_sdk=\$(GYP_ABS_ANDROID_TOP_DIR)/${ANDROID_SDK}"
« 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