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

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

Issue 10914266: Made clang use the gold linker for Android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 | « build/android/arm-linux-androideabi-gold/ld ('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 #!/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 # Defines functions for envsetup.sh which sets up environment for building 7 # Defines functions for envsetup.sh which sets up environment for building
8 # Chromium on Android. The build can be either use the Android NDK/SDK or 8 # Chromium on Android. The build can be either use the Android NDK/SDK or
9 # android source tree. Each has a unique init function which calls functions 9 # android source tree. Each has a unique init function which calls functions
10 # prefixed with "common_" that is common for both environment setups. 10 # prefixed with "common_" that is common for both environment setups.
(...skipping 30 matching lines...) Expand all
41 # Set only if not already set. 41 # Set only if not already set.
42 # Don't override ANDROID_TOOLCHAIN if set by Android configuration env. 42 # Don't override ANDROID_TOOLCHAIN if set by Android configuration env.
43 export ANDROID_TOOLCHAIN=${ANDROID_TOOLCHAIN:-${toolchain_path}} 43 export ANDROID_TOOLCHAIN=${ANDROID_TOOLCHAIN:-${toolchain_path}}
44 44
45 common_check_toolchain 45 common_check_toolchain
46 46
47 # Add Android SDK/NDK tools to system path. 47 # Add Android SDK/NDK tools to system path.
48 export PATH=$PATH:${ANDROID_NDK_ROOT} 48 export PATH=$PATH:${ANDROID_NDK_ROOT}
49 export PATH=$PATH:${ANDROID_SDK_ROOT}/tools 49 export PATH=$PATH:${ANDROID_SDK_ROOT}/tools
50 export PATH=$PATH:${ANDROID_SDK_ROOT}/platform-tools 50 export PATH=$PATH:${ANDROID_SDK_ROOT}/platform-tools
51
52 # This must be set before ANDROID_TOOLCHAIN, so that clang could find the
53 # gold linker.
54 # TODO(michaelbai): Remove this path once the gold linker become the default
55 # linker.
56 export PATH=$PATH:${CHROME_SRC}/build/android/${toolchain_arch}-gold
57
51 # Must have tools like arm-linux-androideabi-gcc on the path for ninja 58 # Must have tools like arm-linux-androideabi-gcc on the path for ninja
52 export PATH=$PATH:${ANDROID_TOOLCHAIN} 59 export PATH=$PATH:${ANDROID_TOOLCHAIN}
53 60
54 # Add Chromium Android development scripts to system path. 61 # Add Chromium Android development scripts to system path.
55 # Must be after CHROME_SRC is set. 62 # Must be after CHROME_SRC is set.
56 export PATH=$PATH:${CHROME_SRC}/build/android 63 export PATH=$PATH:${CHROME_SRC}/build/android
57 64
58 # TODO(beverloo): Remove these once all consumers updated to --strip-binary. 65 # TODO(beverloo): Remove these once all consumers updated to --strip-binary.
59 export OBJCOPY=$(echo ${ANDROID_TOOLCHAIN}/*-objcopy) 66 export OBJCOPY=$(echo ${ANDROID_TOOLCHAIN}/*-objcopy)
60 export STRIP=$(echo ${ANDROID_TOOLCHAIN}/*-strip) 67 export STRIP=$(echo ${ANDROID_TOOLCHAIN}/*-strip)
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
307 314
308 export GYP_GENERATORS="android" 315 export GYP_GENERATORS="android"
309 316
310 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} default_target=All" 317 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} default_target=All"
311 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} limit_to_target_all=1" 318 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} limit_to_target_all=1"
312 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} auto_regeneration=0" 319 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} auto_regeneration=0"
313 320
314 # TODO(torne): This isn't upstream yet. Upstream it or remove this setting. 321 # TODO(torne): This isn't upstream yet. Upstream it or remove this setting.
315 export CHROMIUM_GYP_FILE="${CHROME_SRC}/build/all_android_webview.gyp" 322 export CHROMIUM_GYP_FILE="${CHROME_SRC}/build/all_android_webview.gyp"
316 } 323 }
OLDNEW
« no previous file with comments | « build/android/arm-linux-androideabi-gold/ld ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698