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

Side by Side Diff: tools/clang/scripts/update.sh

Issue 12379078: Update ndk sysroot to API level 14 (Closed) Base URL: https://src.chromium.org/svn/trunk/src/
Patch Set: update clang file 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 unified diff | Download patch
« no previous file with comments | « build/common.gypi ('k') | 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 #!/usr/bin/env bash 1 #!/usr/bin/env bash
2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 2 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
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 # This script will check out llvm and clang into third_party/llvm and build it. 6 # This script will check out llvm and clang into third_party/llvm and build it.
7 7
8 # Do NOT CHANGE this if you don't know what you're doing -- see 8 # Do NOT CHANGE this if you don't know what you're doing -- see
9 # https://code.google.com/p/chromium/wiki/UpdatingClang 9 # https://code.google.com/p/chromium/wiki/UpdatingClang
10 # Reverting problematic clang rolls is safe, though. 10 # Reverting problematic clang rolls is safe, though.
(...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after
343 --without-llvmgcc \ 343 --without-llvmgcc \
344 --without-llvmgxx 344 --without-llvmgxx
345 fi 345 fi
346 346
347 MACOSX_DEPLOYMENT_TARGET=10.5 make -j"${NUM_JOBS}" 347 MACOSX_DEPLOYMENT_TARGET=10.5 make -j"${NUM_JOBS}"
348 cd - 348 cd -
349 349
350 if [[ -n "${with_android}" ]]; then 350 if [[ -n "${with_android}" ]]; then
351 # Make a standalone Android toolchain. 351 # Make a standalone Android toolchain.
352 ${ANDROID_NDK_DIR}/build/tools/make-standalone-toolchain.sh \ 352 ${ANDROID_NDK_DIR}/build/tools/make-standalone-toolchain.sh \
353 --platform=android-9 \ 353 --platform=android-14 \
354 --install-dir="${LLVM_BUILD_DIR}/android-toolchain" 354 --install-dir="${LLVM_BUILD_DIR}/android-toolchain"
355 355
356 # Fixup mismatching version numbers in android-ndk-r8b. 356 # Fixup mismatching version numbers in android-ndk-r8b.
357 # TODO: This will be fixed in the next NDK, remove this when that ships. 357 # TODO: This will be fixed in the next NDK, remove this when that ships.
358 TC="${LLVM_BUILD_DIR}/android-toolchain" 358 TC="${LLVM_BUILD_DIR}/android-toolchain"
359 if [[ -d "${TC}/lib/gcc/arm-linux-androideabi/4.6.x-google" ]]; then 359 if [[ -d "${TC}/lib/gcc/arm-linux-androideabi/4.6.x-google" ]]; then
360 mv "${TC}/lib/gcc/arm-linux-androideabi/4.6.x-google" \ 360 mv "${TC}/lib/gcc/arm-linux-androideabi/4.6.x-google" \
361 "${TC}/lib/gcc/arm-linux-androideabi/4.6" 361 "${TC}/lib/gcc/arm-linux-androideabi/4.6"
362 mv "${TC}/libexec/gcc/arm-linux-androideabi/4.6.x-google" \ 362 mv "${TC}/libexec/gcc/arm-linux-androideabi/4.6.x-google" \
363 "${TC}/libexec/gcc/arm-linux-androideabi/4.6" 363 "${TC}/libexec/gcc/arm-linux-androideabi/4.6"
(...skipping 26 matching lines...) Expand all
390 # Run a few tests. 390 # Run a few tests.
391 PLUGIN_SRC_DIR="${THIS_DIR}/../plugins" 391 PLUGIN_SRC_DIR="${THIS_DIR}/../plugins"
392 "${PLUGIN_SRC_DIR}/tests/test.sh" "${LLVM_BUILD_DIR}/Release+Asserts" 392 "${PLUGIN_SRC_DIR}/tests/test.sh" "${LLVM_BUILD_DIR}/Release+Asserts"
393 cd "${LLVM_BUILD_DIR}" 393 cd "${LLVM_BUILD_DIR}"
394 make check-all 394 make check-all
395 cd - 395 cd -
396 fi 396 fi
397 397
398 # After everything is done, log success for this revision. 398 # After everything is done, log success for this revision.
399 echo "${CLANG_REVISION}" > "${STAMP_FILE}" 399 echo "${CLANG_REVISION}" > "${STAMP_FILE}"
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698