Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 103 | 103 |
| 104 # Default architecture we're building for is the architecture we're | 104 # Default architecture we're building for is the architecture we're |
| 105 # building on. | 105 # building on. |
| 106 'target_arch%': '<(host_arch)', | 106 'target_arch%': '<(host_arch)', |
| 107 | 107 |
| 108 # Sets whether we're building with the Android SDK/NDK (and hence with | 108 # Sets whether we're building with the Android SDK/NDK (and hence with |
| 109 # Ant, value 0), or as part of the Android system (and hence with the | 109 # Ant, value 0), or as part of the Android system (and hence with the |
| 110 # Android build system, value 1). | 110 # Android build system, value 1). |
| 111 'android_build_type%': 0, | 111 'android_build_type%': 0, |
| 112 | 112 |
| 113 # Sets whether chrome is built for android tv device. | |
|
Yaron
2013/01/24 00:32:29
"google" (i.e. be consistent)
kjyoun
2013/01/24 00:55:46
Done.
| |
| 114 'google_tv%': 0, | |
| 115 | |
| 113 'conditions': [ | 116 'conditions': [ |
| 114 # Set default value of toolkit_views based on OS. | 117 # Set default value of toolkit_views based on OS. |
| 115 ['OS=="win" or chromeos==1 or use_aura==1', { | 118 ['OS=="win" or chromeos==1 or use_aura==1', { |
| 116 'toolkit_views%': 1, | 119 'toolkit_views%': 1, |
| 117 }, { | 120 }, { |
| 118 'toolkit_views%': 0, | 121 'toolkit_views%': 0, |
| 119 }], | 122 }], |
| 120 | 123 |
| 121 # Set toolkit_uses_gtk for the Chromium browser on Linux. | 124 # Set toolkit_uses_gtk for the Chromium browser on Linux. |
| 122 ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and use_aura==0', { | 125 ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and use_aura==0', { |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 160 'toolkit_views%': '<(toolkit_views)', | 163 'toolkit_views%': '<(toolkit_views)', |
| 161 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', | 164 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', |
| 162 'use_aura%': '<(use_aura)', | 165 'use_aura%': '<(use_aura)', |
| 163 'use_ash%': '<(use_ash)', | 166 'use_ash%': '<(use_ash)', |
| 164 'use_openssl%': '<(use_openssl)', | 167 'use_openssl%': '<(use_openssl)', |
| 165 'use_ibus%': '<(use_ibus)', | 168 'use_ibus%': '<(use_ibus)', |
| 166 'enable_viewport%': '<(enable_viewport)', | 169 'enable_viewport%': '<(enable_viewport)', |
| 167 'enable_hidpi%': '<(enable_hidpi)', | 170 'enable_hidpi%': '<(enable_hidpi)', |
| 168 'enable_touch_ui%': '<(enable_touch_ui)', | 171 'enable_touch_ui%': '<(enable_touch_ui)', |
| 169 'android_build_type%': '<(android_build_type)', | 172 'android_build_type%': '<(android_build_type)', |
| 173 'google_tv%': '<(google_tv)', | |
| 170 'enable_app_list%': '<(enable_app_list)', | 174 'enable_app_list%': '<(enable_app_list)', |
| 171 'enable_message_center%': '<(enable_message_center)', | 175 'enable_message_center%': '<(enable_message_center)', |
| 172 'use_default_render_theme%': '<(use_default_render_theme)', | 176 'use_default_render_theme%': '<(use_default_render_theme)', |
| 173 'buildtype%': '<(buildtype)', | 177 'buildtype%': '<(buildtype)', |
| 174 | 178 |
| 175 # We used to provide a variable for changing how libraries were built. | 179 # We used to provide a variable for changing how libraries were built. |
| 176 # This variable remains until we can clean up all the users. | 180 # This variable remains until we can clean up all the users. |
| 177 # This needs to be one nested variables dict in so that dependent | 181 # This needs to be one nested variables dict in so that dependent |
| 178 # gyp files can make use of it in their outer variables. (Yikes!) | 182 # gyp files can make use of it in their outer variables. (Yikes!) |
| 179 # http://code.google.com/p/chromium/issues/detail?id=83308 | 183 # http://code.google.com/p/chromium/issues/detail?id=83308 |
| (...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 519 ['OS=="win" and buildtype!="Official"', { | 523 ['OS=="win" and buildtype!="Official"', { |
| 520 'chromium_win_pch%': 1 | 524 'chromium_win_pch%': 1 |
| 521 }], | 525 }], |
| 522 | 526 |
| 523 ['use_aura==1 or chromeos==1 or OS=="android"', { | 527 ['use_aura==1 or chromeos==1 or OS=="android"', { |
| 524 'enable_plugin_installation%': 0, | 528 'enable_plugin_installation%': 0, |
| 525 }, { | 529 }, { |
| 526 'enable_plugin_installation%': 1, | 530 'enable_plugin_installation%': 1, |
| 527 }], | 531 }], |
| 528 | 532 |
| 529 ['OS=="android" or OS=="ios"', { | 533 ['(OS=="android" and google_tv!=1) or OS=="ios"', { |
|
iannucci
2013/01/23 23:56:27
why not just
google_tv!=1 or OS=="ios"
kjyoun
2013/01/24 00:55:46
We need to check android device,
since google_tv =
| |
| 530 'enable_plugins%': 0, | 534 'enable_plugins%': 0, |
| 531 }, { | 535 }, { |
| 532 'enable_plugins%': 1, | 536 'enable_plugins%': 1, |
| 533 }], | 537 }], |
| 534 | 538 |
| 535 # linux_use_gold_binary: whether to use the binary checked into | 539 # linux_use_gold_binary: whether to use the binary checked into |
| 536 # third_party/gold. | 540 # third_party/gold. |
| 537 ['OS=="linux"', { | 541 ['OS=="linux"', { |
| 538 'linux_use_gold_binary%': 1, | 542 'linux_use_gold_binary%': 1, |
| 539 }, { | 543 }, { |
| (...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 712 'enable_google_now%': '<(enable_google_now)', | 716 'enable_google_now%': '<(enable_google_now)', |
| 713 'enable_language_detection%': '<(enable_language_detection)', | 717 'enable_language_detection%': '<(enable_language_detection)', |
| 714 'enable_captive_portal_detection%': '<(enable_captive_portal_detection)', | 718 'enable_captive_portal_detection%': '<(enable_captive_portal_detection)', |
| 715 'disable_ftp_support%': '<(disable_ftp_support)', | 719 'disable_ftp_support%': '<(disable_ftp_support)', |
| 716 'enable_task_manager%': '<(enable_task_manager)', | 720 'enable_task_manager%': '<(enable_task_manager)', |
| 717 'sas_dll_path%': '<(sas_dll_path)', | 721 'sas_dll_path%': '<(sas_dll_path)', |
| 718 'wix_path%': '<(wix_path)', | 722 'wix_path%': '<(wix_path)', |
| 719 'use_libjpeg_turbo%': '<(use_libjpeg_turbo)', | 723 'use_libjpeg_turbo%': '<(use_libjpeg_turbo)', |
| 720 'use_system_libjpeg%': '<(use_system_libjpeg)', | 724 'use_system_libjpeg%': '<(use_system_libjpeg)', |
| 721 'android_build_type%': '<(android_build_type)', | 725 'android_build_type%': '<(android_build_type)', |
| 726 'google_tv%': '<(google_tv)', | |
| 722 'enable_app_list%': '<(enable_app_list)', | 727 'enable_app_list%': '<(enable_app_list)', |
| 723 'enable_message_center%': '<(enable_message_center)', | 728 'enable_message_center%': '<(enable_message_center)', |
| 724 'use_default_render_theme%': '<(use_default_render_theme)', | 729 'use_default_render_theme%': '<(use_default_render_theme)', |
| 725 'enable_settings_app%': '<(enable_settings_app)', | 730 'enable_settings_app%': '<(enable_settings_app)', |
| 726 'use_official_google_api_keys%': '<(use_official_google_api_keys)', | 731 'use_official_google_api_keys%': '<(use_official_google_api_keys)', |
| 727 'google_api_key%': '<(google_api_key)', | 732 'google_api_key%': '<(google_api_key)', |
| 728 'google_default_client_id%': '<(google_default_client_id)', | 733 'google_default_client_id%': '<(google_default_client_id)', |
| 729 'google_default_client_secret%': '<(google_default_client_secret)', | 734 'google_default_client_secret%': '<(google_default_client_secret)', |
| 730 | 735 |
| 731 # Use system nspr instead of the bundled one. | 736 # Use system nspr instead of the bundled one. |
| (...skipping 913 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1645 'defines': ['ENABLE_ONE_CLICK_SIGNIN'], | 1650 'defines': ['ENABLE_ONE_CLICK_SIGNIN'], |
| 1646 }], | 1651 }], |
| 1647 ['toolkit_uses_gtk==1 and toolkit_views==0', { | 1652 ['toolkit_uses_gtk==1 and toolkit_views==0', { |
| 1648 # TODO(erg): We are progressively sealing up use of deprecated features | 1653 # TODO(erg): We are progressively sealing up use of deprecated features |
| 1649 # in gtk in preparation for an eventual porting to gtk3. | 1654 # in gtk in preparation for an eventual porting to gtk3. |
| 1650 'defines': ['GTK_DISABLE_SINGLE_INCLUDES=1'], | 1655 'defines': ['GTK_DISABLE_SINGLE_INCLUDES=1'], |
| 1651 }], | 1656 }], |
| 1652 ['chromeos==1', { | 1657 ['chromeos==1', { |
| 1653 'defines': ['OS_CHROMEOS=1'], | 1658 'defines': ['OS_CHROMEOS=1'], |
| 1654 }], | 1659 }], |
| 1660 ['google_tv==1', { | |
| 1661 'defines': ['GOOGLE_TV=1'], | |
| 1662 }], | |
| 1655 ['use_xi2_mt!=0', { | 1663 ['use_xi2_mt!=0', { |
| 1656 'defines': ['USE_XI2_MT=<(use_xi2_mt)'], | 1664 'defines': ['USE_XI2_MT=<(use_xi2_mt)'], |
| 1657 }], | 1665 }], |
| 1658 ['file_manager_extension==1', { | 1666 ['file_manager_extension==1', { |
| 1659 'defines': ['FILE_MANAGER_EXTENSION=1'], | 1667 'defines': ['FILE_MANAGER_EXTENSION=1'], |
| 1660 }], | 1668 }], |
| 1661 ['profiling==1', { | 1669 ['profiling==1', { |
| 1662 'defines': ['ENABLE_PROFILING=1'], | 1670 'defines': ['ENABLE_PROFILING=1'], |
| 1663 }], | 1671 }], |
| 1664 ['OS=="linux" and glibcxx_debug==1', { | 1672 ['OS=="linux" and glibcxx_debug==1', { |
| (...skipping 2292 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3957 # settings in target dicts. SYMROOT is a special case, because many other | 3965 # settings in target dicts. SYMROOT is a special case, because many other |
| 3958 # Xcode variables depend on it, including variables such as | 3966 # Xcode variables depend on it, including variables such as |
| 3959 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 3967 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 3960 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 3968 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 3961 # files to appear (when present) in the UI as actual files and not red | 3969 # files to appear (when present) in the UI as actual files and not red |
| 3962 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 3970 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 3963 # and therefore SYMROOT, needs to be set at the project level. | 3971 # and therefore SYMROOT, needs to be set at the project level. |
| 3964 'SYMROOT': '<(DEPTH)/xcodebuild', | 3972 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 3965 }, | 3973 }, |
| 3966 } | 3974 } |
| OLD | NEW |