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

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

Issue 12035035: Remove CHROME_VERSION_EXTRA from envsetup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 if [[ -n "$CHROME_ANDROID_OFFICIAL_BUILD" ]]; then 86 if [[ -n "$CHROME_ANDROID_OFFICIAL_BUILD" ]]; then
87 DEFINES+=" branding=Chrome" 87 DEFINES+=" branding=Chrome"
88 DEFINES+=" buildtype=Official" 88 DEFINES+=" buildtype=Official"
89 89
90 # These defines are used by various chrome build scripts to tag the binary's 90 # These defines are used by various chrome build scripts to tag the binary's
91 # version string as 'official' in linux builds (e.g. in 91 # version string as 'official' in linux builds (e.g. in
92 # chrome/trunk/src/chrome/tools/build/version.py). 92 # chrome/trunk/src/chrome/tools/build/version.py).
93 export OFFICIAL_BUILD=1 93 export OFFICIAL_BUILD=1
94 export CHROMIUM_BUILD="_google_chrome" 94 export CHROMIUM_BUILD="_google_chrome"
95 export CHROME_BUILD_TYPE="_official" 95 export CHROME_BUILD_TYPE="_official"
96
97 # Used by chrome_version_info_posix.cc to display the channel name.
98 # Valid values: "unstable", "stable", "dev", "beta".
99 export CHROME_VERSION_EXTRA="beta"
100 fi 96 fi
101 97
102 # The order file specifies the order of symbols in the .text section of the 98 # The order file specifies the order of symbols in the .text section of the
103 # shared library, libchromeview.so. The file is an order list of section 99 # shared library, libchromeview.so. The file is an order list of section
104 # names and the library is linked with option 100 # names and the library is linked with option
105 # --section-ordering-file=<orderfile>. The order file is updated by profiling 101 # --section-ordering-file=<orderfile>. The order file is updated by profiling
106 # startup after compiling with the order_profiling=1 GYP_DEFINES flag. 102 # startup after compiling with the order_profiling=1 GYP_DEFINES flag.
107 ORDER_DEFINES="order_text_section=${CHROME_SRC}/orderfiles/orderfile.out" 103 ORDER_DEFINES="order_text_section=${CHROME_SRC}/orderfiles/orderfile.out"
108 104
109 # The following defines will affect ARM code generation of both C/C++ compiler 105 # The following defines will affect ARM code generation of both C/C++ compiler
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 export GYP_DEFINES="${DEFINES}" 272 export GYP_DEFINES="${DEFINES}"
277 273
278 export GYP_GENERATORS="android" 274 export GYP_GENERATORS="android"
279 275
280 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} default_target=All" 276 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} default_target=All"
281 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} limit_to_target_all=1" 277 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} limit_to_target_all=1"
282 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} auto_regeneration=0" 278 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} auto_regeneration=0"
283 279
284 export CHROMIUM_GYP_FILE="${CHROME_SRC}/android_webview/all_webview.gyp" 280 export CHROMIUM_GYP_FILE="${CHROME_SRC}/android_webview/all_webview.gyp"
285 } 281 }
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