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

Side by Side Diff: build/common.gypi

Issue 1054543002: Move android_app_version_* into an inner variables dict. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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 | « android_webview/apk/java/AndroidManifest.xml ('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 # 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 1063 matching lines...) Expand 10 before | Expand all | Expand 10 after
1074 # 1074 #
1075 # Note that if you are building an official build or if 1075 # Note that if you are building an official build or if
1076 # use_official_google_api_keys has been set to 1 (explicitly or 1076 # use_official_google_api_keys has been set to 1 (explicitly or
1077 # implicitly), these values will be ignored and the official 1077 # implicitly), these values will be ignored and the official
1078 # keys will be used instead. 1078 # keys will be used instead.
1079 'google_api_key%': '', 1079 'google_api_key%': '',
1080 'google_default_client_id%': '', 1080 'google_default_client_id%': '',
1081 'google_default_client_secret%': '', 1081 'google_default_client_secret%': '',
1082 # Native Client is enabled by default. 1082 # Native Client is enabled by default.
1083 'disable_nacl%': '0', 1083 'disable_nacl%': '0',
1084
1085 # Sets the default version name and code for Android app, by default we
1086 # do a developer build.
1087 'android_app_version_name%': 'Developer Build',
1088 'android_app_version_code%': 1,
1084 }, 1089 },
1085 1090
1086 # Copy conditionally-set variables out one scope. 1091 # Copy conditionally-set variables out one scope.
1087 'branding%': '<(branding)', 1092 'branding%': '<(branding)',
1088 'buildtype%': '<(buildtype)', 1093 'buildtype%': '<(buildtype)',
1089 'target_arch%': '<(target_arch)', 1094 'target_arch%': '<(target_arch)',
1090 'target_subarch%': '<(target_subarch)', 1095 'target_subarch%': '<(target_subarch)',
1091 'mips_arch_variant%': '<(mips_arch_variant)', 1096 'mips_arch_variant%': '<(mips_arch_variant)',
1092 'mips_dsp_rev%': '<(mips_dsp_rev)', 1097 'mips_dsp_rev%': '<(mips_dsp_rev)',
1093 'host_arch%': '<(host_arch)', 1098 'host_arch%': '<(host_arch)',
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
1229 'use_lto%': '<(use_lto)', 1234 'use_lto%': '<(use_lto)',
1230 'use_lto_o2%': '<(use_lto_o2)', 1235 'use_lto_o2%': '<(use_lto_o2)',
1231 'gold_icf_level%': '<(gold_icf_level)', 1236 'gold_icf_level%': '<(gold_icf_level)',
1232 'video_hole%': '<(video_hole)', 1237 'video_hole%': '<(video_hole)',
1233 'v8_use_external_startup_data%': '<(v8_use_external_startup_data)', 1238 'v8_use_external_startup_data%': '<(v8_use_external_startup_data)',
1234 'cfi_vptr%': '<(cfi_vptr)', 1239 'cfi_vptr%': '<(cfi_vptr)',
1235 'cfi_derived_cast%': '<(cfi_derived_cast)', 1240 'cfi_derived_cast%': '<(cfi_derived_cast)',
1236 'cfi_unrelated_cast%': '<(cfi_unrelated_cast)', 1241 'cfi_unrelated_cast%': '<(cfi_unrelated_cast)',
1237 'cfi_blacklist%': '<(cfi_blacklist)', 1242 'cfi_blacklist%': '<(cfi_blacklist)',
1238 'mac_views_browser%': '<(mac_views_browser)', 1243 'mac_views_browser%': '<(mac_views_browser)',
1244 'android_app_version_name%': '<(android_app_version_name)',
1245 'android_app_version_code%': '<(android_app_version_code)',
1239 1246
1240 # Use system protobuf instead of bundled one. 1247 # Use system protobuf instead of bundled one.
1241 'use_system_protobuf%': 0, 1248 'use_system_protobuf%': 0,
1242 1249
1243 # Use system yasm instead of bundled one. 1250 # Use system yasm instead of bundled one.
1244 'use_system_yasm%': 0, 1251 'use_system_yasm%': 0,
1245 1252
1246 # Use system ICU instead of bundled one. 1253 # Use system ICU instead of bundled one.
1247 'use_system_icu%' : 0, 1254 'use_system_icu%' : 0,
1248 1255
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
1460 1467
1461 # Portable Native Client is enabled by default. 1468 # Portable Native Client is enabled by default.
1462 'disable_pnacl%': 0, 1469 'disable_pnacl%': 0,
1463 1470
1464 # Whether to build full debug version for Debug configuration on Android. 1471 # Whether to build full debug version for Debug configuration on Android.
1465 # Compared to full debug version, the default Debug configuration on Android 1472 # Compared to full debug version, the default Debug configuration on Android
1466 # has no full v8 debug, has size optimization and linker gc section, so that 1473 # has no full v8 debug, has size optimization and linker gc section, so that
1467 # we can build a debug version with acceptable size and performance. 1474 # we can build a debug version with acceptable size and performance.
1468 'android_full_debug%': 0, 1475 'android_full_debug%': 0,
1469 1476
1470 # Sets the default version name and code for Android app, by default we
1471 # do a developer build.
1472 'android_app_version_name%': 'Developer Build',
1473 'android_app_version_code%': 1,
1474
1475 # Contains data about the attached devices for gyp_managed_install. 1477 # Contains data about the attached devices for gyp_managed_install.
1476 'build_device_config_path': '<(PRODUCT_DIR)/build_devices.cfg', 1478 'build_device_config_path': '<(PRODUCT_DIR)/build_devices.cfg',
1477 1479
1478 'sas_dll_exists': '<!pymod_do_main(dir_exists "<(sas_dll_path)")', 1480 'sas_dll_exists': '<!pymod_do_main(dir_exists "<(sas_dll_path)")',
1479 'wix_exists': '<!pymod_do_main(dir_exists "<(wix_path)")', 1481 'wix_exists': '<!pymod_do_main(dir_exists "<(wix_path)")',
1480 1482
1481 'windows_sdk_default_path': '<(DEPTH)/third_party/platformsdk_win8/files', 1483 'windows_sdk_default_path': '<(DEPTH)/third_party/platformsdk_win8/files',
1482 'directx_sdk_default_path': '<(DEPTH)/third_party/directxsdk/files', 1484 'directx_sdk_default_path': '<(DEPTH)/third_party/directxsdk/files',
1483 1485
1484 # Whether we are using the rlz library or not. Platforms like Android send 1486 # Whether we are using the rlz library or not. Platforms like Android send
(...skipping 4604 matching lines...) Expand 10 before | Expand all | Expand 10 after
6089 # settings in target dicts. SYMROOT is a special case, because many other 6091 # settings in target dicts. SYMROOT is a special case, because many other
6090 # Xcode variables depend on it, including variables such as 6092 # Xcode variables depend on it, including variables such as
6091 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 6093 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
6092 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 6094 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
6093 # files to appear (when present) in the UI as actual files and not red 6095 # files to appear (when present) in the UI as actual files and not red
6094 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 6096 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
6095 # and therefore SYMROOT, needs to be set at the project level. 6097 # and therefore SYMROOT, needs to be set at the project level.
6096 'SYMROOT': '<(DEPTH)/xcodebuild', 6098 'SYMROOT': '<(DEPTH)/xcodebuild',
6097 }, 6099 },
6098 } 6100 }
OLDNEW
« no previous file with comments | « android_webview/apk/java/AndroidManifest.xml ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698