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

Side by Side Diff: build/common.gypi

Issue 1919903002: Revert of Add Archive step for iOS builds. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 | « 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 3557 matching lines...) Expand 10 before | Expand all | Expand 10 after
3568 # stripping as well. 3568 # stripping as well.
3569 'xcode_settings': { 3569 'xcode_settings': {
3570 'DEBUG_INFORMATION_FORMAT': 'dwarf-with-dsym', 3570 'DEBUG_INFORMATION_FORMAT': 'dwarf-with-dsym',
3571 'DEPLOYMENT_POSTPROCESSING': 'YES', 3571 'DEPLOYMENT_POSTPROCESSING': 'YES',
3572 'STRIP_INSTALLED_PRODUCT': 'YES', 3572 'STRIP_INSTALLED_PRODUCT': 'YES',
3573 }, 3573 },
3574 }], 3574 }],
3575 ], 3575 ],
3576 }, 3576 },
3577 }], 3577 }],
3578 [ 'OS=="ios"', {
3579 'Archive': {
3580 'inherit_from': ['Common_Base', 'x86_Base', 'Release_Base'],
3581 'xcode_settings': {
3582 'GCC_SYMBOLS_PRIVATE_EXTERN': 'YES', # -fvisibility=hidden
3583 'STRIP_INSTALLED_PRODUCT': 'YES',
3584 },
3585 },
3586 }],
3587 [ 'OS=="win"', { 3578 [ 'OS=="win"', {
3588 # TODO(bradnelson): add a gyp mechanism to make this more graceful. 3579 # TODO(bradnelson): add a gyp mechanism to make this more graceful.
3589 'Debug_x64': { 3580 'Debug_x64': {
3590 'inherit_from': ['Common_Base', 'x64_Base', 'Debug_Base'], 3581 'inherit_from': ['Common_Base', 'x64_Base', 'Debug_Base'],
3591 }, 3582 },
3592 'Release_x64': { 3583 'Release_x64': {
3593 'inherit_from': ['Common_Base', 'x64_Base', 'Release_Base'], 3584 'inherit_from': ['Common_Base', 'x64_Base', 'Release_Base'],
3594 }, 3585 },
3595 }], 3586 }],
3596 ], 3587 ],
(...skipping 1437 matching lines...) Expand 10 before | Expand all | Expand 10 after
5034 'CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS': 'YES', 5025 'CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS': 'YES',
5035 'COPY_PHASE_STRIP': 'NO', 5026 'COPY_PHASE_STRIP': 'NO',
5036 'GCC_C_LANGUAGE_STANDARD': 'c99', # -std=c99 5027 'GCC_C_LANGUAGE_STANDARD': 'c99', # -std=c99
5037 'GCC_CW_ASM_SYNTAX': 'NO', # No -fasm-blocks 5028 'GCC_CW_ASM_SYNTAX': 'NO', # No -fasm-blocks
5038 'GCC_ENABLE_CPP_EXCEPTIONS': 'NO', # -fno-exceptions 5029 'GCC_ENABLE_CPP_EXCEPTIONS': 'NO', # -fno-exceptions
5039 'GCC_ENABLE_CPP_RTTI': 'NO', # -fno-rtti 5030 'GCC_ENABLE_CPP_RTTI': 'NO', # -fno-rtti
5040 'GCC_ENABLE_PASCAL_STRINGS': 'NO', # No -mpascal-strings 5031 'GCC_ENABLE_PASCAL_STRINGS': 'NO', # No -mpascal-strings
5041 # GCC_INLINES_ARE_PRIVATE_EXTERN maps to -fvisibility-inlines-hidden 5032 # GCC_INLINES_ARE_PRIVATE_EXTERN maps to -fvisibility-inlines-hidden
5042 'GCC_INLINES_ARE_PRIVATE_EXTERN': 'YES', 5033 'GCC_INLINES_ARE_PRIVATE_EXTERN': 'YES',
5043 'GCC_OBJC_CALL_CXX_CDTORS': 'YES', # -fobjc-call-cxx-cdtors 5034 'GCC_OBJC_CALL_CXX_CDTORS': 'YES', # -fobjc-call-cxx-cdtors
5035 'GCC_SYMBOLS_PRIVATE_EXTERN': 'YES', # -fvisibility=hidden
5044 'GCC_THREADSAFE_STATICS': 'NO', # -fno-threadsafe-statics 5036 'GCC_THREADSAFE_STATICS': 'NO', # -fno-threadsafe-statics
5045 'GCC_TREAT_WARNINGS_AS_ERRORS': 'YES', # -Werror 5037 'GCC_TREAT_WARNINGS_AS_ERRORS': 'YES', # -Werror
5046 'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0', 5038 'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0',
5047 'USE_HEADERMAP': 'NO', 5039 'USE_HEADERMAP': 'NO',
5048 'WARNING_CFLAGS': [ 5040 'WARNING_CFLAGS': [
5049 '-Wall', 5041 '-Wall',
5050 '-Wextra', 5042 '-Wextra',
5051 # Don't warn about unused function parameters. 5043 # Don't warn about unused function parameters.
5052 '-Wno-unused-parameter', 5044 '-Wno-unused-parameter',
5053 # Don't warn about the "struct foo f = {0};" initialization 5045 # Don't warn about the "struct foo f = {0};" initialization
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
5122 ['_toolset=="target"', { 5114 ['_toolset=="target"', {
5123 'cflags': [ 5115 'cflags': [
5124 '-fsanitize-coverage=<(sanitizer_coverage)', 5116 '-fsanitize-coverage=<(sanitizer_coverage)',
5125 ], 5117 ],
5126 'defines': [ 5118 'defines': [
5127 'SANITIZER_COVERAGE', 5119 'SANITIZER_COVERAGE',
5128 ], 5120 ],
5129 }], 5121 }],
5130 ], 5122 ],
5131 }], 5123 }],
5132 ['OS=="mac"', {
5133 'xcode_settings': {
5134 'GCC_SYMBOLS_PRIVATE_EXTERN': 'YES', # -fvisibility=hidden
5135 },
5136 }],
5137 ['OS=="ios"', {
5138 'xcode_settings': {
5139 # XCTests inject a dynamic library into the application. If
5140 # fvisibility is set to hidden, then some symbols needed by
5141 # XCTests are not available. This setting is enabled for the
5142 # Archive configuration.
5143 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO',
5144 },
5145 }],
5146 ], 5124 ],
5147 'target_conditions': [ 5125 'target_conditions': [
5148 ['_type!="static_library"', { 5126 ['_type!="static_library"', {
5149 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-search_paths_first']}, 5127 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-search_paths_first']},
5150 'conditions': [ 5128 'conditions': [
5151 ['asan==1', { 5129 ['asan==1', {
5152 'xcode_settings': { 5130 'xcode_settings': {
5153 'OTHER_LDFLAGS': [ 5131 'OTHER_LDFLAGS': [
5154 '-fsanitize=address', 5132 '-fsanitize=address',
5155 ], 5133 ],
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
5440 # instead set it here for target only. 5418 # instead set it here for target only.
5441 'IPHONEOS_DEPLOYMENT_TARGET': '<(ios_deployment_target)', 5419 'IPHONEOS_DEPLOYMENT_TARGET': '<(ios_deployment_target)',
5442 'ARCHS': ['$(ARCHS_STANDARD_INCLUDING_64_BIT)'], 5420 'ARCHS': ['$(ARCHS_STANDARD_INCLUDING_64_BIT)'],
5443 }, 5421 },
5444 }], 5422 }],
5445 ['_type=="executable"', { 5423 ['_type=="executable"', {
5446 'configurations': { 5424 'configurations': {
5447 'Release_Base': { 5425 'Release_Base': {
5448 'xcode_settings': { 5426 'xcode_settings': {
5449 'DEPLOYMENT_POSTPROCESSING': 'YES', 5427 'DEPLOYMENT_POSTPROCESSING': 'YES',
5450 'STRIP_INSTALLED_PRODUCT': 'NO', 5428 'STRIP_INSTALLED_PRODUCT': 'YES',
5451 'conditions': [ 5429 'conditions': [
5452 ['buildtype=="Official"', { 5430 ['buildtype=="Official"', {
5453 'DEBUG_INFORMATION_FORMAT': 'dwarf-with-dsym', 5431 'DEBUG_INFORMATION_FORMAT': 'dwarf-with-dsym',
5454 }, { 5432 }, {
5455 # Remove dSYM to reduce build time. 5433 # Remove dSYM to reduce build time.
5456 'DEBUG_INFORMATION_FORMAT': 'dwarf', 5434 'DEBUG_INFORMATION_FORMAT': 'dwarf',
5457 }], 5435 }],
5458 ], 5436 ],
5459 }, 5437 },
5460 }, 5438 },
(...skipping 878 matching lines...) Expand 10 before | Expand all | Expand 10 after
6339 # settings in target dicts. SYMROOT is a special case, because many other 6317 # settings in target dicts. SYMROOT is a special case, because many other
6340 # Xcode variables depend on it, including variables such as 6318 # Xcode variables depend on it, including variables such as
6341 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 6319 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
6342 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 6320 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
6343 # files to appear (when present) in the UI as actual files and not red 6321 # files to appear (when present) in the UI as actual files and not red
6344 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 6322 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
6345 # and therefore SYMROOT, needs to be set at the project level. 6323 # and therefore SYMROOT, needs to be set at the project level.
6346 'SYMROOT': '<(DEPTH)/xcodebuild', 6324 'SYMROOT': '<(DEPTH)/xcodebuild',
6347 }, 6325 },
6348 } 6326 }
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