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

Side by Side Diff: build/common.gypi

Issue 11029061: Add Android version name and code to gyp settings. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 2 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
« 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 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 # IMPORTANT: 5 # IMPORTANT:
6 # Please don't directly include this file if you are building via gyp_chromium, 6 # Please don't directly include this file if you are building via gyp_chromium,
7 # since gyp_chromium is automatically forcing its inclusion. 7 # since gyp_chromium is automatically forcing its inclusion.
8 { 8 {
9 # Variables expected to be overriden on the GYP command line (-D) or by 9 # Variables expected to be overriden on the GYP command line (-D) or by
10 # ~/.gyp/include.gypi. 10 # ~/.gyp/include.gypi.
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 'enable_hidpi%': '<(enable_hidpi)', 92 'enable_hidpi%': '<(enable_hidpi)',
93 'enable_touch_ui%': '<(enable_touch_ui)', 93 'enable_touch_ui%': '<(enable_touch_ui)',
94 'android_upstream_bringup%': '<(android_upstream_bringup)', 94 'android_upstream_bringup%': '<(android_upstream_bringup)',
95 'buildtype%': '<(buildtype)', 95 'buildtype%': '<(buildtype)',
96 96
97 # Sets whether we're building with the Android SDK/NDK (and hence with 97 # Sets whether we're building with the Android SDK/NDK (and hence with
98 # Ant, value 0), or as part of the Android system (and hence with the 98 # Ant, value 0), or as part of the Android system (and hence with the
99 # Android build system, value 1). 99 # Android build system, value 1).
100 'android_build_type%': 0, 100 'android_build_type%': 0,
101 101
102 # Sets the default version name and code for Android app, by default we
103 # do a developer build.
104 'android_app_version_name%': 'Developer Build',
105 'android_app_version_code%': 0,
106
102 # Compute the architecture that we're building on. 107 # Compute the architecture that we're building on.
103 'conditions': [ 108 'conditions': [
104 ['OS=="win" or OS=="mac" or OS=="ios"', { 109 ['OS=="win" or OS=="mac" or OS=="ios"', {
105 'host_arch%': 'ia32', 110 'host_arch%': 'ia32',
106 }, { 111 }, {
107 # This handles the Unix platforms for which there is some support. 112 # This handles the Unix platforms for which there is some support.
108 # Anything else gets passed through, which probably won't work very 113 # Anything else gets passed through, which probably won't work very
109 # well; such hosts should pass an explicit target_arch to gyp. 114 # well; such hosts should pass an explicit target_arch to gyp.
110 'host_arch%': 115 'host_arch%':
111 '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/a rm.*/arm/;s/i86pc/ia32/")', 116 '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/a rm.*/arm/;s/i86pc/ia32/")',
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 149 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
145 'use_aura%': '<(use_aura)', 150 'use_aura%': '<(use_aura)',
146 'use_ash%': '<(use_ash)', 151 'use_ash%': '<(use_ash)',
147 'use_openssl%': '<(use_openssl)', 152 'use_openssl%': '<(use_openssl)',
148 'use_ibus%': '<(use_ibus)', 153 'use_ibus%': '<(use_ibus)',
149 'enable_viewport%': '<(enable_viewport)', 154 'enable_viewport%': '<(enable_viewport)',
150 'enable_hidpi%': '<(enable_hidpi)', 155 'enable_hidpi%': '<(enable_hidpi)',
151 'enable_touch_ui%': '<(enable_touch_ui)', 156 'enable_touch_ui%': '<(enable_touch_ui)',
152 'android_upstream_bringup%': '<(android_upstream_bringup)', 157 'android_upstream_bringup%': '<(android_upstream_bringup)',
153 'android_build_type%': '<(android_build_type)', 158 'android_build_type%': '<(android_build_type)',
159 'android_app_version_name%': '<(android_app_version_name)',
160 'android_app_version_code%': '<(android_app_version_code)',
154 161
155 # We used to provide a variable for changing how libraries were built. 162 # We used to provide a variable for changing how libraries were built.
156 # This variable remains until we can clean up all the users. 163 # This variable remains until we can clean up all the users.
157 # This needs to be one nested variables dict in so that dependent 164 # This needs to be one nested variables dict in so that dependent
158 # gyp files can make use of it in their outer variables. (Yikes!) 165 # gyp files can make use of it in their outer variables. (Yikes!)
159 # http://code.google.com/p/chromium/issues/detail?id=83308 166 # http://code.google.com/p/chromium/issues/detail?id=83308
160 'library%': 'static_library', 167 'library%': 'static_library',
161 168
162 # Override branding to select the desired branding flavor. 169 # Override branding to select the desired branding flavor.
163 'branding%': 'Chromium', 170 'branding%': 'Chromium',
(...skipping 498 matching lines...) Expand 10 before | Expand all | Expand 10 after
662 'enable_captive_portal_detection%': '<(enable_captive_portal_detection)', 669 'enable_captive_portal_detection%': '<(enable_captive_portal_detection)',
663 'disable_ftp_support%': '<(disable_ftp_support)', 670 'disable_ftp_support%': '<(disable_ftp_support)',
664 'force_rlz_use_chrome_net%': '<(force_rlz_use_chrome_net)', 671 'force_rlz_use_chrome_net%': '<(force_rlz_use_chrome_net)',
665 'enable_task_manager%': '<(enable_task_manager)', 672 'enable_task_manager%': '<(enable_task_manager)',
666 'sas_dll_path%': '<(sas_dll_path)', 673 'sas_dll_path%': '<(sas_dll_path)',
667 'wix_path%': '<(wix_path)', 674 'wix_path%': '<(wix_path)',
668 'android_upstream_bringup%': '<(android_upstream_bringup)', 675 'android_upstream_bringup%': '<(android_upstream_bringup)',
669 'use_libjpeg_turbo%': '<(use_libjpeg_turbo)', 676 'use_libjpeg_turbo%': '<(use_libjpeg_turbo)',
670 'use_system_libjpeg%': '<(use_system_libjpeg)', 677 'use_system_libjpeg%': '<(use_system_libjpeg)',
671 'android_build_type%': '<(android_build_type)', 678 'android_build_type%': '<(android_build_type)',
679 'android_app_version_name%': '<(android_app_version_name)',
cjhopman 2012/10/05 20:16:20 Can't you just set the defaults here rather than s
shashi 2012/10/05 20:42:49 Done, the reason I did it was mostly for conventio
680 'android_app_version_code%': '<(android_app_version_code)',
672 'use_official_google_api_keys%': '<(use_official_google_api_keys)', 681 'use_official_google_api_keys%': '<(use_official_google_api_keys)',
673 'google_api_key%': '<(google_api_key)', 682 'google_api_key%': '<(google_api_key)',
674 'google_default_client_id%': '<(google_default_client_id)', 683 'google_default_client_id%': '<(google_default_client_id)',
675 'google_default_client_secret%': '<(google_default_client_secret)', 684 'google_default_client_secret%': '<(google_default_client_secret)',
676 685
677 # Use system yasm instead of bundled one. 686 # Use system yasm instead of bundled one.
678 'use_system_yasm%': 0, 687 'use_system_yasm%': 0,
679 688
680 # Use compositor implementation in cc/ instead of in WebKit. 689 # Use compositor implementation in cc/ instead of in WebKit.
681 'use_libcc_for_compositor%': 1, 690 'use_libcc_for_compositor%': 1,
(...skipping 2826 matching lines...) Expand 10 before | Expand all | Expand 10 after
3508 # settings in target dicts. SYMROOT is a special case, because many other 3517 # settings in target dicts. SYMROOT is a special case, because many other
3509 # Xcode variables depend on it, including variables such as 3518 # Xcode variables depend on it, including variables such as
3510 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3519 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3511 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 3520 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
3512 # files to appear (when present) in the UI as actual files and not red 3521 # files to appear (when present) in the UI as actual files and not red
3513 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3522 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
3514 # and therefore SYMROOT, needs to be set at the project level. 3523 # and therefore SYMROOT, needs to be set at the project level.
3515 'SYMROOT': '<(DEPTH)/xcodebuild', 3524 'SYMROOT': '<(DEPTH)/xcodebuild',
3516 }, 3525 },
3517 } 3526 }
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