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

Unified Diff: tools/clang/scripts/update.sh

Issue 927703002: Clang update script: disable --with-android with LLVM_FORCE_HEAD_REVISION (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Actually, build it when targetting Android. Created 5 years, 10 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: tools/clang/scripts/update.sh
diff --git a/tools/clang/scripts/update.sh b/tools/clang/scripts/update.sh
index 369b1c90a2c919e52d24c752ec425ca7f86ad0ec..7c60472c5932707635c50fe584cd13c430b70f92 100755
--- a/tools/clang/scripts/update.sh
+++ b/tools/clang/scripts/update.sh
@@ -156,6 +156,11 @@ if [[ -n ${LLVM_FORCE_HEAD_REVISION:-''} ]]; then
# Skip local patches when using HEAD: they probably don't apply anymore.
with_patches=
+ if ! [[ "$GYP_DEFINES" =~ .*OS=android.* ]]; then
+ # Only build the Android ASan rt when targetting Android.
+ with_android=
+ fi
+
echo "LLVM_FORCE_HEAD_REVISION was set; using r${CLANG_REVISION}"
fi
« 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