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

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: 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') | chrome/app/theme/theme_resources.grd » ('J')
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 632 matching lines...) Expand 10 before | Expand all | Expand 10 after
643 # Allowed level of identical code folding in the gold linker. 643 # Allowed level of identical code folding in the gold linker.
644 'gold_icf_level%': 'safe', 644 'gold_icf_level%': 'safe',
645 645
646 # Libxkbcommon usage. 646 # Libxkbcommon usage.
647 'use_xkbcommon%': 0, 647 'use_xkbcommon%': 0,
648 648
649 # Control Flow Integrity for virtual calls. 649 # Control Flow Integrity for virtual calls.
650 # See http://clang.llvm.org/docs/ControlFlowIntegrity.html 650 # See http://clang.llvm.org/docs/ControlFlowIntegrity.html
651 'cfi_vptr%': 0, 651 'cfi_vptr%': 0,
652 652
653 # Whether the browser is non-native (using Views Toolkit) on Mac.
tapted 2015/03/12 18:16:46 nit: I wouldn't say "non-native", I would just say
Andre 2015/03/12 21:16:41 Done.
654 'mac_views_browser%': 0,
655
653 'conditions': [ 656 'conditions': [
654 # A flag for POSIX platforms 657 # A flag for POSIX platforms
655 ['OS=="win"', { 658 ['OS=="win"', {
656 'os_posix%': 0, 659 'os_posix%': 0,
657 }, { 660 }, {
658 'os_posix%': 1, 661 'os_posix%': 1,
659 }], 662 }],
660 663
661 # A flag for BSD platforms 664 # A flag for BSD platforms
662 ['OS=="freebsd" or OS=="openbsd"', { 665 ['OS=="freebsd" or OS=="openbsd"', {
(...skipping 555 matching lines...) Expand 10 before | Expand all | Expand 10 after
1218 'proprietary_codecs%': '<(proprietary_codecs)', 1221 'proprietary_codecs%': '<(proprietary_codecs)',
1219 'use_goma%': '<(use_goma)', 1222 'use_goma%': '<(use_goma)',
1220 'gomadir%': '<(gomadir)', 1223 'gomadir%': '<(gomadir)',
1221 'use_lto%': '<(use_lto)', 1224 'use_lto%': '<(use_lto)',
1222 'use_lto_o2%': '<(use_lto_o2)', 1225 'use_lto_o2%': '<(use_lto_o2)',
1223 'gold_icf_level%': '<(gold_icf_level)', 1226 'gold_icf_level%': '<(gold_icf_level)',
1224 'video_hole%': '<(video_hole)', 1227 'video_hole%': '<(video_hole)',
1225 'support_pre_M6_history_database%': '<(support_pre_M6_history_database)', 1228 'support_pre_M6_history_database%': '<(support_pre_M6_history_database)',
1226 'v8_use_external_startup_data%': '<(v8_use_external_startup_data)', 1229 'v8_use_external_startup_data%': '<(v8_use_external_startup_data)',
1227 'cfi_vptr%': '<(cfi_vptr)', 1230 'cfi_vptr%': '<(cfi_vptr)',
1231 'mac_views_browser%': '<(mac_views_browser)',
1228 1232
1229 # Use system protobuf instead of bundled one. 1233 # Use system protobuf instead of bundled one.
1230 'use_system_protobuf%': 0, 1234 'use_system_protobuf%': 0,
1231 1235
1232 # Use system yasm instead of bundled one. 1236 # Use system yasm instead of bundled one.
1233 'use_system_yasm%': 0, 1237 'use_system_yasm%': 0,
1234 1238
1235 # Use system ICU instead of bundled one. 1239 # Use system ICU instead of bundled one.
1236 'use_system_icu%' : 0, 1240 'use_system_icu%' : 0,
1237 1241
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
1506 'ozone_platform%': "", 1510 'ozone_platform%': "",
1507 1511
1508 # Ozone platforms to include in the build. 1512 # Ozone platforms to include in the build.
1509 'ozone_platform_caca%': 0, 1513 'ozone_platform_caca%': 0,
1510 'ozone_platform_dri%': 0, 1514 'ozone_platform_dri%': 0,
1511 'ozone_platform_egltest%': 0, 1515 'ozone_platform_egltest%': 0,
1512 'ozone_platform_gbm%': 0, 1516 'ozone_platform_gbm%': 0,
1513 'ozone_platform_ozonex%': 0, 1517 'ozone_platform_ozonex%': 0,
1514 'ozone_platform_test%': 0, 1518 'ozone_platform_test%': 0,
1515 1519
1516 # Whether the browser is non-native (using Views Toolkit) on Mac.
1517 'mac_views_browser%': 0,
1518
1519 # Experiment: http://crbug.com/426914 1520 # Experiment: http://crbug.com/426914
1520 'envoy%': 0, 1521 'envoy%': 0,
1521 1522
1522 'conditions': [ 1523 'conditions': [
1523 ['buildtype=="Official"', { 1524 ['buildtype=="Official"', {
1524 # Continue to embed build meta data in Official builds, basically the 1525 # Continue to embed build meta data in Official builds, basically the
1525 # time it was built. 1526 # time it was built.
1526 # TODO(maruel): This decision should be revisited because having an 1527 # TODO(maruel): This decision should be revisited because having an
1527 # official deterministic build has high value too but MSVC toolset can't 1528 # official deterministic build has high value too but MSVC toolset can't
1528 # generate anything deterministic with WPO enabled AFAIK. 1529 # generate anything deterministic with WPO enabled AFAIK.
(...skipping 624 matching lines...) Expand 10 before | Expand all | Expand 10 after
2153 }], 2154 }],
2154 ['enable_task_manager==1', { 2155 ['enable_task_manager==1', {
2155 'grit_defines': ['-D', 'enable_task_manager'], 2156 'grit_defines': ['-D', 'enable_task_manager'],
2156 }], 2157 }],
2157 ['notifications==1', { 2158 ['notifications==1', {
2158 'grit_defines': ['-D', 'enable_notifications'], 2159 'grit_defines': ['-D', 'enable_notifications'],
2159 }], 2160 }],
2160 ['enable_wifi_bootstrapping==1', { 2161 ['enable_wifi_bootstrapping==1', {
2161 'grit_defines': ['-D', 'enable_wifi_bootstrapping'], 2162 'grit_defines': ['-D', 'enable_wifi_bootstrapping'],
2162 }], 2163 }],
2164 ['mac_views_browser==1', {
2165 'grit_defines': ['-D', 'mac_views_browser'],
2166 }],
2163 ['enable_resource_whitelist_generation==1 and OS!="win"', { 2167 ['enable_resource_whitelist_generation==1 and OS!="win"', {
2164 'grit_rc_header_format': ['-h', '#define {textual_id} _Pragma("whitelist ed_resource_{numeric_id}") {numeric_id}'], 2168 'grit_rc_header_format': ['-h', '#define {textual_id} _Pragma("whitelist ed_resource_{numeric_id}") {numeric_id}'],
2165 }], 2169 }],
2166 ['enable_resource_whitelist_generation==1 and OS=="win"', { 2170 ['enable_resource_whitelist_generation==1 and OS=="win"', {
2167 'grit_rc_header_format': ['-h', '#define {textual_id} __pragma(message(" whitelisted_resource_{numeric_id}")) {numeric_id}'], 2171 'grit_rc_header_format': ['-h', '#define {textual_id} __pragma(message(" whitelisted_resource_{numeric_id}")) {numeric_id}'],
2168 }], 2172 }],
2169 ['enable_mdns==1 or OS=="mac"', { 2173 ['enable_mdns==1 or OS=="mac"', {
2170 'grit_defines': ['-D', 'enable_service_discovery'], 2174 'grit_defines': ['-D', 'enable_service_discovery'],
2171 'enable_service_discovery%': 1 2175 'enable_service_discovery%': 1
2172 }], 2176 }],
(...skipping 3868 matching lines...) Expand 10 before | Expand all | Expand 10 after
6041 # settings in target dicts. SYMROOT is a special case, because many other 6045 # settings in target dicts. SYMROOT is a special case, because many other
6042 # Xcode variables depend on it, including variables such as 6046 # Xcode variables depend on it, including variables such as
6043 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 6047 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
6044 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 6048 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
6045 # files to appear (when present) in the UI as actual files and not red 6049 # files to appear (when present) in the UI as actual files and not red
6046 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 6050 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
6047 # and therefore SYMROOT, needs to be set at the project level. 6051 # and therefore SYMROOT, needs to be set at the project level.
6048 'SYMROOT': '<(DEPTH)/xcodebuild', 6052 'SYMROOT': '<(DEPTH)/xcodebuild',
6049 }, 6053 },
6050 } 6054 }
OLDNEW
« no previous file with comments | « no previous file | build/config/ui.gni » ('j') | chrome/app/theme/theme_resources.grd » ('J')

Powered by Google App Engine
This is Rietveld 408576698