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

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

Issue 165893002: Moving version script and gypi file to build\util. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Found the goof... tools -> util... :-/ Created 6 years, 10 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 | build/isolate.gypi » ('j') | build/util/version.gypi » ('J')
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 12 matching lines...) Expand all
23 # Add Chromium Android development scripts to system path. 23 # Add Chromium Android development scripts to system path.
24 # Must be after CHROME_SRC is set. 24 # Must be after CHROME_SRC is set.
25 export PATH=$PATH:${CHROME_SRC}/build/android 25 export PATH=$PATH:${CHROME_SRC}/build/android
26 26
27 # The set of GYP_DEFINES to pass to gyp. 27 # The set of GYP_DEFINES to pass to gyp.
28 DEFINES="OS=android" 28 DEFINES="OS=android"
29 29
30 if [[ -n "$CHROME_ANDROID_OFFICIAL_BUILD" ]]; then 30 if [[ -n "$CHROME_ANDROID_OFFICIAL_BUILD" ]]; then
31 # These defines are used by various chrome build scripts to tag the binary's 31 # These defines are used by various chrome build scripts to tag the binary's
32 # version string as 'official' in linux builds (e.g. in 32 # version string as 'official' in linux builds (e.g. in
33 # chrome/trunk/src/chrome/tools/build/version.py). 33 # chrome/trunk/src/build/util/version.py).
34 export OFFICIAL_BUILD=1 34 export OFFICIAL_BUILD=1
35 export CHROMIUM_BUILD="_google_chrome" 35 export CHROMIUM_BUILD="_google_chrome"
36 export CHROME_BUILD_TYPE="_official" 36 export CHROME_BUILD_TYPE="_official"
37 fi 37 fi
38 38
39 # TODO(thakis), Jan 18 2014: Remove this after two weeks or so, after telling 39 # TODO(thakis), Jan 18 2014: Remove this after two weeks or so, after telling
40 # everyone to set use_goma in GYP_DEFINES instead of a GOMA_DIR env var. 40 # everyone to set use_goma in GYP_DEFINES instead of a GOMA_DIR env var.
41 if [[ -d $GOMA_DIR ]]; then 41 if [[ -d $GOMA_DIR ]]; then
42 DEFINES+=" use_goma=1 gomadir=$GOMA_DIR" 42 DEFINES+=" use_goma=1 gomadir=$GOMA_DIR"
43 fi 43 fi
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 DEFINES+=" android_sdk_root=\$(PWD)/${ANDROID_SDK}" 174 DEFINES+=" android_sdk_root=\$(PWD)/${ANDROID_SDK}"
175 DEFINES+=" android_sdk_tools=\$(PWD)/${ANDROID_SDK_TOOLS}" 175 DEFINES+=" android_sdk_tools=\$(PWD)/${ANDROID_SDK_TOOLS}"
176 DEFINES+=" android_sdk_version=${ANDROID_SDK_VERSION}" 176 DEFINES+=" android_sdk_version=${ANDROID_SDK_VERSION}"
177 DEFINES+=" android_toolchain=${ANDROID_TOOLCHAIN}" 177 DEFINES+=" android_toolchain=${ANDROID_TOOLCHAIN}"
178 if [[ -n "$CHROME_ANDROID_WEBVIEW_OFFICIAL_BUILD" ]]; then 178 if [[ -n "$CHROME_ANDROID_WEBVIEW_OFFICIAL_BUILD" ]]; then
179 DEFINES+=" logging_like_official_build=1" 179 DEFINES+=" logging_like_official_build=1"
180 DEFINES+=" tracing_like_official_build=1" 180 DEFINES+=" tracing_like_official_build=1"
181 fi 181 fi
182 export GYP_DEFINES="${DEFINES}" 182 export GYP_DEFINES="${DEFINES}"
183 } 183 }
OLDNEW
« no previous file with comments | « no previous file | build/isolate.gypi » ('j') | build/util/version.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698