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

Side by Side Diff: build/common.gypi

Issue 983823004: MacViews: Fix missing browser assets (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@titlebar
Patch Set: Undo patchset 5 Created 5 years, 9 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 | build/config/ui.gni » ('j') | 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 629 matching lines...) Expand 10 before | Expand all | Expand 10 after
640 # Allowed level of identical code folding in the gold linker. 640 # Allowed level of identical code folding in the gold linker.
641 'gold_icf_level%': 'safe', 641 'gold_icf_level%': 'safe',
642 642
643 # Libxkbcommon usage. 643 # Libxkbcommon usage.
644 'use_xkbcommon%': 0, 644 'use_xkbcommon%': 0,
645 645
646 # Control Flow Integrity for virtual calls. 646 # Control Flow Integrity for virtual calls.
647 # See http://clang.llvm.org/docs/ControlFlowIntegrity.html 647 # See http://clang.llvm.org/docs/ControlFlowIntegrity.html
648 'cfi_vptr%': 0, 648 'cfi_vptr%': 0,
649 649
650 # Whether the entire browser uses toolkit-views on Mac instead of Cocoa.
651 'mac_views_browser%': 0,
652
650 'conditions': [ 653 'conditions': [
651 # A flag for POSIX platforms 654 # A flag for POSIX platforms
652 ['OS=="win"', { 655 ['OS=="win"', {
653 'os_posix%': 0, 656 'os_posix%': 0,
654 }, { 657 }, {
655 'os_posix%': 1, 658 'os_posix%': 1,
656 }], 659 }],
657 660
658 # A flag for BSD platforms 661 # A flag for BSD platforms
659 ['OS=="freebsd" or OS=="openbsd"', { 662 ['OS=="freebsd" or OS=="openbsd"', {
(...skipping 547 matching lines...) Expand 10 before | Expand all | Expand 10 after
1207 'v8_optimized_debug%': '<(v8_optimized_debug)', 1210 'v8_optimized_debug%': '<(v8_optimized_debug)',
1208 'proprietary_codecs%': '<(proprietary_codecs)', 1211 'proprietary_codecs%': '<(proprietary_codecs)',
1209 'use_goma%': '<(use_goma)', 1212 'use_goma%': '<(use_goma)',
1210 'gomadir%': '<(gomadir)', 1213 'gomadir%': '<(gomadir)',
1211 'use_lto%': '<(use_lto)', 1214 'use_lto%': '<(use_lto)',
1212 'use_lto_o2%': '<(use_lto_o2)', 1215 'use_lto_o2%': '<(use_lto_o2)',
1213 'gold_icf_level%': '<(gold_icf_level)', 1216 'gold_icf_level%': '<(gold_icf_level)',
1214 'video_hole%': '<(video_hole)', 1217 'video_hole%': '<(video_hole)',
1215 'v8_use_external_startup_data%': '<(v8_use_external_startup_data)', 1218 'v8_use_external_startup_data%': '<(v8_use_external_startup_data)',
1216 'cfi_vptr%': '<(cfi_vptr)', 1219 'cfi_vptr%': '<(cfi_vptr)',
1220 'mac_views_browser%': '<(mac_views_browser)',
1217 1221
1218 # Use system protobuf instead of bundled one. 1222 # Use system protobuf instead of bundled one.
1219 'use_system_protobuf%': 0, 1223 'use_system_protobuf%': 0,
1220 1224
1221 # Use system yasm instead of bundled one. 1225 # Use system yasm instead of bundled one.
1222 'use_system_yasm%': 0, 1226 'use_system_yasm%': 0,
1223 1227
1224 # Use system ICU instead of bundled one. 1228 # Use system ICU instead of bundled one.
1225 'use_system_icu%' : 0, 1229 'use_system_icu%' : 0,
1226 1230
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after
1496 1500
1497 # Ozone platforms to include in the build. 1501 # Ozone platforms to include in the build.
1498 'ozone_platform_caca%': 0, 1502 'ozone_platform_caca%': 0,
1499 'ozone_platform_dri%': 0, 1503 'ozone_platform_dri%': 0,
1500 'ozone_platform_drm%': 0, 1504 'ozone_platform_drm%': 0,
1501 'ozone_platform_egltest%': 0, 1505 'ozone_platform_egltest%': 0,
1502 'ozone_platform_gbm%': 0, 1506 'ozone_platform_gbm%': 0,
1503 'ozone_platform_ozonex%': 0, 1507 'ozone_platform_ozonex%': 0,
1504 'ozone_platform_test%': 0, 1508 'ozone_platform_test%': 0,
1505 1509
1506 # Whether the browser is non-native (using Views Toolkit) on Mac.
1507 'mac_views_browser%': 0,
1508
1509 # Experiment: http://crbug.com/426914 1510 # Experiment: http://crbug.com/426914
1510 'envoy%': 0, 1511 'envoy%': 0,
1511 1512
1512 'conditions': [ 1513 'conditions': [
1513 ['buildtype=="Official"', { 1514 ['buildtype=="Official"', {
1514 # Continue to embed build meta data in Official builds, basically the 1515 # Continue to embed build meta data in Official builds, basically the
1515 # time it was built. 1516 # time it was built.
1516 # TODO(maruel): This decision should be revisited because having an 1517 # TODO(maruel): This decision should be revisited because having an
1517 # official deterministic build has high value too but MSVC toolset can't 1518 # official deterministic build has high value too but MSVC toolset can't
1518 # generate anything deterministic with WPO enabled AFAIK. 1519 # generate anything deterministic with WPO enabled AFAIK.
(...skipping 629 matching lines...) Expand 10 before | Expand all | Expand 10 after
2148 }], 2149 }],
2149 ['enable_task_manager==1', { 2150 ['enable_task_manager==1', {
2150 'grit_defines': ['-D', 'enable_task_manager'], 2151 'grit_defines': ['-D', 'enable_task_manager'],
2151 }], 2152 }],
2152 ['notifications==1', { 2153 ['notifications==1', {
2153 'grit_defines': ['-D', 'enable_notifications'], 2154 'grit_defines': ['-D', 'enable_notifications'],
2154 }], 2155 }],
2155 ['enable_wifi_bootstrapping==1', { 2156 ['enable_wifi_bootstrapping==1', {
2156 'grit_defines': ['-D', 'enable_wifi_bootstrapping'], 2157 'grit_defines': ['-D', 'enable_wifi_bootstrapping'],
2157 }], 2158 }],
2159 ['mac_views_browser==1', {
2160 'grit_defines': ['-D', 'mac_views_browser'],
2161 }],
2158 ['enable_resource_whitelist_generation==1 and OS!="win"', { 2162 ['enable_resource_whitelist_generation==1 and OS!="win"', {
2159 'grit_rc_header_format': ['-h', '#define {textual_id} _Pragma("whitelist ed_resource_{numeric_id}") {numeric_id}'], 2163 'grit_rc_header_format': ['-h', '#define {textual_id} _Pragma("whitelist ed_resource_{numeric_id}") {numeric_id}'],
2160 }], 2164 }],
2161 ['enable_resource_whitelist_generation==1 and OS=="win"', { 2165 ['enable_resource_whitelist_generation==1 and OS=="win"', {
2162 'grit_rc_header_format': ['-h', '#define {textual_id} __pragma(message(" whitelisted_resource_{numeric_id}")) {numeric_id}'], 2166 'grit_rc_header_format': ['-h', '#define {textual_id} __pragma(message(" whitelisted_resource_{numeric_id}")) {numeric_id}'],
2163 }], 2167 }],
2164 ['enable_mdns==1 or OS=="mac"', { 2168 ['enable_mdns==1 or OS=="mac"', {
2165 'grit_defines': ['-D', 'enable_service_discovery'], 2169 'grit_defines': ['-D', 'enable_service_discovery'],
2166 'enable_service_discovery%': 1 2170 'enable_service_discovery%': 1
2167 }], 2171 }],
(...skipping 3861 matching lines...) Expand 10 before | Expand all | Expand 10 after
6029 # settings in target dicts. SYMROOT is a special case, because many other 6033 # settings in target dicts. SYMROOT is a special case, because many other
6030 # Xcode variables depend on it, including variables such as 6034 # Xcode variables depend on it, including variables such as
6031 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 6035 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
6032 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 6036 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
6033 # files to appear (when present) in the UI as actual files and not red 6037 # files to appear (when present) in the UI as actual files and not red
6034 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 6038 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
6035 # and therefore SYMROOT, needs to be set at the project level. 6039 # and therefore SYMROOT, needs to be set at the project level.
6036 'SYMROOT': '<(DEPTH)/xcodebuild', 6040 'SYMROOT': '<(DEPTH)/xcodebuild',
6037 }, 6041 },
6038 } 6042 }
OLDNEW
« no previous file with comments | « no previous file | build/config/ui.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698