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

Side by Side Diff: build/android/envsetup.sh

Issue 10918045: Fix Clang build on Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address Sam's comment Created 8 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | 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 #!/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 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 88
89 # Source a bunch of helper functions 89 # Source a bunch of helper functions
90 . ${CHROME_SRC}/build/android/adb_device_functions.sh 90 . ${CHROME_SRC}/build/android/adb_device_functions.sh
91 91
92 ANDROID_GOMA_WRAPPER="" 92 ANDROID_GOMA_WRAPPER=""
93 if [[ -d $GOMA_DIR ]]; then 93 if [[ -d $GOMA_DIR ]]; then
94 ANDROID_GOMA_WRAPPER="$GOMA_DIR/gomacc" 94 ANDROID_GOMA_WRAPPER="$GOMA_DIR/gomacc"
95 fi 95 fi
96 export ANDROID_GOMA_WRAPPER 96 export ANDROID_GOMA_WRAPPER
97 97
98 export CC_target="${ANDROID_GOMA_WRAPPER} $(echo -n ${ANDROID_TOOLCHAIN}/*-gcc)" 98 # http://crbug.com/143889.
99 export CXX_target="${ANDROID_GOMA_WRAPPER} \ 99 if ! echo "$GYP_DEFINES" | tr ' ' '\n' | grep -q '^clang=' | tail -n1 | \
100 $(echo -n ${ANDROID_TOOLCHAIN}/*-g++)" 100 grep -xq clang=1; then
101 export LINK_target=$(echo -n ${ANDROID_TOOLCHAIN}/*-gcc) 101 export CC_target="${ANDROID_GOMA_WRAPPER} \
102 export AR_target=$(echo -n ${ANDROID_TOOLCHAIN}/*-ar) 102 $(echo -n ${ANDROID_TOOLCHAIN}/*-gcc)"
103 export CXX_target="${ANDROID_GOMA_WRAPPER} \
104 $(echo -n ${ANDROID_TOOLCHAIN}/*-g++)"
105 export LINK_target=$(echo -n ${ANDROID_TOOLCHAIN}/*-gcc)
106 export AR_target=$(echo -n ${ANDROID_TOOLCHAIN}/*-ar)
107 fi
103 108
104 # Performs a gyp_chromium run to convert gyp->Makefile for android code. 109 # Performs a gyp_chromium run to convert gyp->Makefile for android code.
105 android_gyp() { 110 android_gyp() {
106 echo "GYP_GENERATORS set to '$GYP_GENERATORS'" 111 echo "GYP_GENERATORS set to '$GYP_GENERATORS'"
107 "${CHROME_SRC}/build/gyp_chromium" --depth="${CHROME_SRC}" --check "$@" 112 "${CHROME_SRC}/build/gyp_chromium" --depth="${CHROME_SRC}" --check "$@"
108 } 113 }
109 114
110 # FLOCK needs to be null on system that has no flock 115 # FLOCK needs to be null on system that has no flock
111 which flock > /dev/null || export FLOCK= 116 which flock > /dev/null || export FLOCK=
OLDNEW
« 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