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

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

Issue 145083013: android envsetup: Stop setting OBJCOPY. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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 # 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 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 # gold linker. 66 # gold linker.
67 # TODO(michaelbai): Remove this path once the gold linker become the default 67 # TODO(michaelbai): Remove this path once the gold linker become the default
68 # linker. 68 # linker.
69 export PATH=$PATH:${CHROME_SRC}/build/android/${toolchain_arch}-gold 69 export PATH=$PATH:${CHROME_SRC}/build/android/${toolchain_arch}-gold
70 70
71 # Add Chromium Android development scripts to system path. 71 # Add Chromium Android development scripts to system path.
72 # Must be after CHROME_SRC is set. 72 # Must be after CHROME_SRC is set.
73 export PATH=$PATH:${CHROME_SRC}/build/android 73 export PATH=$PATH:${CHROME_SRC}/build/android
74 74
75 # TODO(beverloo): Remove these once all consumers updated to --strip-binary. 75 # TODO(beverloo): Remove these once all consumers updated to --strip-binary.
76 export OBJCOPY=$(echo ${ANDROID_TOOLCHAIN}/*-objcopy) 76 # http://crbug.com/142642
77 export STRIP=$(echo ${ANDROID_TOOLCHAIN}/*-strip) 77 export STRIP=$(echo ${ANDROID_TOOLCHAIN}/*-strip)
78 78
79 # The set of GYP_DEFINES to pass to gyp. Use 'readlink -e' on directories 79 # The set of GYP_DEFINES to pass to gyp. Use 'readlink -e' on directories
80 # to canonicalize them (remove double '/', remove trailing '/', etc). 80 # to canonicalize them (remove double '/', remove trailing '/', etc).
81 DEFINES="OS=android" 81 DEFINES="OS=android"
82 DEFINES+=" host_os=${host_os}" 82 DEFINES+=" host_os=${host_os}"
83 83
84 if [[ -n "$CHROME_ANDROID_OFFICIAL_BUILD" ]]; then 84 if [[ -n "$CHROME_ANDROID_OFFICIAL_BUILD" ]]; then
85 DEFINES+=" branding=Chrome" 85 DEFINES+=" branding=Chrome"
86 DEFINES+=" buildtype=Official" 86 DEFINES+=" buildtype=Official"
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 fi 319 fi
320 export GYP_DEFINES="${DEFINES}" 320 export GYP_DEFINES="${DEFINES}"
321 321
322 export GYP_GENERATORS="android" 322 export GYP_GENERATORS="android"
323 323
324 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} default_target=All" 324 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} default_target=All"
325 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} limit_to_target_all=1" 325 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} limit_to_target_all=1"
326 326
327 export CHROMIUM_GYP_FILE="${CHROME_SRC}/android_webview/all_webview.gyp" 327 export CHROMIUM_GYP_FILE="${CHROME_SRC}/android_webview/all_webview.gyp"
328 } 328 }
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