Chromium Code Reviews Chromium Code Reviews
Issue 11028014:
Extend envsetup.sh Clang hack to ASan builds. (Closed)
Base URL: http://git.chromium.org/chromium/src.git@master| OLD | NEW |
|---|---|
| 1 #!/bin/bash | 1 #!/bin/bash |
| 2 | 2 |
| 3 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 3 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 4 # Use of this source code is governed by a BSD-style license that can be | 4 # Use of this source code is governed by a BSD-style license that can be |
| 5 # found in the LICENSE file. | 5 # found in the LICENSE file. |
| 6 | 6 |
| 7 # Sets up environment for building Chromium on Android. It can either be | 7 # Sets up environment for building Chromium on Android. It can either be |
| 8 # compiled with the Android tree or using the Android SDK/NDK. To build with | 8 # compiled with the Android tree or using the Android SDK/NDK. To build with |
| 9 # NDK/SDK: ". build/android/envsetup.sh --sdk". Environment variable | 9 # NDK/SDK: ". build/android/envsetup.sh --sdk". Environment variable |
| 10 # ANDROID_SDK_BUILD=1 will then be defined and used in the rest of the setup to | 10 # ANDROID_SDK_BUILD=1 will then be defined and used in the rest of the setup to |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 105 # Performs a gyp_chromium run to convert gyp->Makefile for android code. | 105 # Performs a gyp_chromium run to convert gyp->Makefile for android code. |
| 106 android_gyp() { | 106 android_gyp() { |
| 107 echo "GYP_GENERATORS set to '$GYP_GENERATORS'" | 107 echo "GYP_GENERATORS set to '$GYP_GENERATORS'" |
| 108 # http://crbug.com/143889. | 108 # http://crbug.com/143889. |
| 109 # In case we are doing a Clang build, we have to unset CC_target and | 109 # In case we are doing a Clang build, we have to unset CC_target and |
| 110 # CXX_target. Otherwise GYP ends up generating a gcc build (although we set | 110 # CXX_target. Otherwise GYP ends up generating a gcc build (although we set |
| 111 # 'clang' to 1). This behavior was introduced by | 111 # 'clang' to 1). This behavior was introduced by |
| 112 # 54d2f6fe6d8a7b9d9786bd1f8540df6b4f46b83f in GYP. | 112 # 54d2f6fe6d8a7b9d9786bd1f8540df6b4f46b83f in GYP. |
| 113 ( | 113 ( |
| 114 # Fork to avoid side effects on the user's environment variables. | 114 # Fork to avoid side effects on the user's environment variables. |
| 115 if echo "$GYP_DEFINES" | grep -q clang; then | 115 if echo "$GYP_DEFINES" | grep -qE '(clang|asan)'; then |
|
michaelbai
2012/10/02 17:11:50
Why did you need this change? Would asan only be s
| |
| 116 if echo "$CXX_target" | grep -q g++; then | 116 if echo "$CXX_target" | grep -q g++; then |
| 117 unset CXX_target | 117 unset CXX_target |
| 118 fi | 118 fi |
| 119 fi | 119 fi |
| 120 "${CHROME_SRC}/build/gyp_chromium" --depth="${CHROME_SRC}" --check "$@" | 120 "${CHROME_SRC}/build/gyp_chromium" --depth="${CHROME_SRC}" --check "$@" |
| 121 ) | 121 ) |
| 122 } | 122 } |
| 123 | 123 |
| 124 # FLOCK needs to be null on system that has no flock | 124 # FLOCK needs to be null on system that has no flock |
| 125 which flock > /dev/null || export FLOCK= | 125 which flock > /dev/null || export FLOCK= |
| OLD | NEW |
