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

Side by Side Diff: build/common.gypi

Issue 286013002: Added alternative configuration for the data reduction proxy (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: DCHECK fix Created 6 years, 6 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
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 532 matching lines...) Expand 10 before | Expand all | Expand 10 after
543 543
544 # Platform sends memory pressure signals natively. 544 # Platform sends memory pressure signals natively.
545 'native_memory_pressure_signals%': 0, 545 'native_memory_pressure_signals%': 0,
546 546
547 'data_reduction_fallback_host%' : '', 547 'data_reduction_fallback_host%' : '',
548 'data_reduction_dev_host%' : '', 548 'data_reduction_dev_host%' : '',
549 'spdy_proxy_auth_origin%' : '', 549 'spdy_proxy_auth_origin%' : '',
550 'spdy_proxy_auth_property%' : '', 550 'spdy_proxy_auth_property%' : '',
551 'spdy_proxy_auth_value%' : '', 551 'spdy_proxy_auth_value%' : '',
552 'data_reduction_proxy_probe_url%' : '', 552 'data_reduction_proxy_probe_url%' : '',
553 'data_reduction_proxy_ssl_origin%' : '',
554 'data_reduction_proxy_alt_origin%' : '',
555 'data_reduction_proxy_alt_fallback_origin%' : '',
553 'enable_mdns%' : 0, 556 'enable_mdns%' : 0,
554 'enable_service_discovery%': 0, 557 'enable_service_discovery%': 0,
555 'enable_wifi_bootstrapping%': 0, 558 'enable_wifi_bootstrapping%': 0,
556 'enable_hangout_services_extension%': 0, 559 'enable_hangout_services_extension%': 0,
557 560
558 # Enable the Syzygy optimization step. 561 # Enable the Syzygy optimization step.
559 'syzygy_optimize%': 0, 562 'syzygy_optimize%': 0,
560 563
561 # Enable hole punching for the protected video. 564 # Enable hole punching for the protected video.
562 'video_hole%': 0, 565 'video_hole%': 0,
(...skipping 529 matching lines...) Expand 10 before | Expand all | Expand 10 after
1092 'google_default_client_secret%': '<(google_default_client_secret)', 1095 'google_default_client_secret%': '<(google_default_client_secret)',
1093 'enable_managed_users%': '<(enable_managed_users)', 1096 'enable_managed_users%': '<(enable_managed_users)',
1094 'native_discardable_memory%': '<(native_discardable_memory)', 1097 'native_discardable_memory%': '<(native_discardable_memory)',
1095 'native_memory_pressure_signals%': '<(native_memory_pressure_signals)', 1098 'native_memory_pressure_signals%': '<(native_memory_pressure_signals)',
1096 'data_reduction_fallback_host%': '<(data_reduction_fallback_host)', 1099 'data_reduction_fallback_host%': '<(data_reduction_fallback_host)',
1097 'data_reduction_dev_host%': '<(data_reduction_dev_host)', 1100 'data_reduction_dev_host%': '<(data_reduction_dev_host)',
1098 'spdy_proxy_auth_origin%': '<(spdy_proxy_auth_origin)', 1101 'spdy_proxy_auth_origin%': '<(spdy_proxy_auth_origin)',
1099 'spdy_proxy_auth_property%': '<(spdy_proxy_auth_property)', 1102 'spdy_proxy_auth_property%': '<(spdy_proxy_auth_property)',
1100 'spdy_proxy_auth_value%': '<(spdy_proxy_auth_value)', 1103 'spdy_proxy_auth_value%': '<(spdy_proxy_auth_value)',
1101 'data_reduction_proxy_probe_url%': '<(data_reduction_proxy_probe_url)', 1104 'data_reduction_proxy_probe_url%': '<(data_reduction_proxy_probe_url)',
1105 'data_reduction_proxy_ssl_origin%' : '<(data_reduction_proxy_ssl_origin)',
1106 'data_reduction_proxy_alt_origin%' : '<(data_reduction_proxy_alt_origin)',
1107 'data_reduction_proxy_alt_fallback_origin%' : '<(data_reduction_proxy_alt_fa llback_origin)',
1102 'enable_mdns%' : '<(enable_mdns)', 1108 'enable_mdns%' : '<(enable_mdns)',
1103 'enable_service_discovery%' : '<(enable_service_discovery)', 1109 'enable_service_discovery%' : '<(enable_service_discovery)',
1104 'enable_wifi_bootstrapping%': '<(enable_wifi_bootstrapping)', 1110 'enable_wifi_bootstrapping%': '<(enable_wifi_bootstrapping)',
1105 'enable_hangout_services_extension%' : '<(enable_hangout_services_extension) ', 1111 'enable_hangout_services_extension%' : '<(enable_hangout_services_extension) ',
1106 'v8_optimized_debug%': '<(v8_optimized_debug)', 1112 'v8_optimized_debug%': '<(v8_optimized_debug)',
1107 'proprietary_codecs%': '<(proprietary_codecs)', 1113 'proprietary_codecs%': '<(proprietary_codecs)',
1108 'use_goma%': '<(use_goma)', 1114 'use_goma%': '<(use_goma)',
1109 'gomadir%': '<(gomadir)', 1115 'gomadir%': '<(gomadir)',
1110 'video_hole%': '<(video_hole)', 1116 'video_hole%': '<(video_hole)',
1111 1117
(...skipping 1599 matching lines...) Expand 10 before | Expand all | Expand 10 after
2711 ['spdy_proxy_auth_property != ""', { 2717 ['spdy_proxy_auth_property != ""', {
2712 'defines': ['SPDY_PROXY_AUTH_PROPERTY="<(spdy_proxy_auth_property)"'], 2718 'defines': ['SPDY_PROXY_AUTH_PROPERTY="<(spdy_proxy_auth_property)"'],
2713 }], 2719 }],
2714 ['spdy_proxy_auth_value != ""', { 2720 ['spdy_proxy_auth_value != ""', {
2715 'defines': ['SPDY_PROXY_AUTH_VALUE="<(spdy_proxy_auth_value)"'], 2721 'defines': ['SPDY_PROXY_AUTH_VALUE="<(spdy_proxy_auth_value)"'],
2716 }], 2722 }],
2717 ['data_reduction_proxy_probe_url != ""', { 2723 ['data_reduction_proxy_probe_url != ""', {
2718 'defines': [ 2724 'defines': [
2719 'DATA_REDUCTION_PROXY_PROBE_URL="<(data_reduction_proxy_probe_url)"'], 2725 'DATA_REDUCTION_PROXY_PROBE_URL="<(data_reduction_proxy_probe_url)"'],
2720 }], 2726 }],
2727 ['data_reduction_proxy_ssl_origin != ""', {
2728 'defines': [
2729 'DATA_REDUCTION_PROXY_SSL_ORIGIN="<(data_reduction_proxy_ssl_origin)"' ],
2730 }],
2731 ['data_reduction_proxy_alt_origin != ""', {
2732 'defines': [
2733 'DATA_REDUCTION_PROXY_ALT_ORIGIN="<(data_reduction_proxy_alt_origin)"' ],
2734 }],
2735 ['data_reduction_proxy_alt_fallback_origin != ""', {
2736 'defines': [
2737 'DATA_REDUCTION_PROXY_ALT_FALLBACK_ORIGIN="<(data_reduction_proxy_alt_ fallback_origin)"'],
2738 }],
2721 ['enable_mdns==1', { 2739 ['enable_mdns==1', {
2722 'defines': ['ENABLE_MDNS=1'], 2740 'defines': ['ENABLE_MDNS=1'],
2723 }], 2741 }],
2724 ['enable_service_discovery==1', { 2742 ['enable_service_discovery==1', {
2725 'defines' : [ 'ENABLE_SERVICE_DISCOVERY=1' ], 2743 'defines' : [ 'ENABLE_SERVICE_DISCOVERY=1' ],
2726 }], 2744 }],
2727 ['enable_wifi_bootstrapping==1', { 2745 ['enable_wifi_bootstrapping==1', {
2728 'defines' : [ 'ENABLE_WIFI_BOOTSTRAPPING=1' ], 2746 'defines' : [ 'ENABLE_WIFI_BOOTSTRAPPING=1' ],
2729 }], 2747 }],
2730 ['enable_hangout_services_extension==1', { 2748 ['enable_hangout_services_extension==1', {
(...skipping 2649 matching lines...) Expand 10 before | Expand all | Expand 10 after
5380 # settings in target dicts. SYMROOT is a special case, because many other 5398 # settings in target dicts. SYMROOT is a special case, because many other
5381 # Xcode variables depend on it, including variables such as 5399 # Xcode variables depend on it, including variables such as
5382 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5400 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5383 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5401 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5384 # files to appear (when present) in the UI as actual files and not red 5402 # files to appear (when present) in the UI as actual files and not red
5385 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5403 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5386 # and therefore SYMROOT, needs to be set at the project level. 5404 # and therefore SYMROOT, needs to be set at the project level.
5387 'SYMROOT': '<(DEPTH)/xcodebuild', 5405 'SYMROOT': '<(DEPTH)/xcodebuild',
5388 }, 5406 },
5389 } 5407 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698