| OLD | NEW | 
|    1 # Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. |    1 # Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 
|    2 # |    2 # | 
|    3 # Use of this source code is governed by a BSD-style license |    3 # Use of this source code is governed by a BSD-style license | 
|    4 # that can be found in the LICENSE file in the root of the source |    4 # that can be found in the LICENSE file in the root of the source | 
|    5 # tree. An additional intellectual property rights grant can be found |    5 # tree. An additional intellectual property rights grant can be found | 
|    6 # in the file PATENTS.  All contributing project authors may |    6 # in the file PATENTS.  All contributing project authors may | 
|    7 # be found in the AUTHORS file in the root of the source tree. |    7 # be found in the AUTHORS file in the root of the source tree. | 
|    8  |    8  | 
|    9 # This file contains common settings for building WebRTC components. |    9 # This file contains common settings for building WebRTC components. | 
|   10  |   10  | 
|   11 { |   11 { | 
|   12   # Nesting is required in order to use variables for setting other variables. |   12   # Nesting is required in order to use variables for setting other variables. | 
|   13   'variables': { |   13   'variables': { | 
|   14     'variables': { |   14     'variables': { | 
|   15       'variables': { |   15       'variables': { | 
|   16         'variables': { |   16         'variables': { | 
|   17           # This will already be set to zero by supplement.gypi |   17           # This will already be set to zero by supplement.gypi | 
|   18           'build_with_chromium%': 1, |   18           'build_with_chromium%': 1, | 
|   19         }, |   19         }, | 
|   20         'build_with_chromium%': '<(build_with_chromium)', |   20         'build_with_chromium%': '<(build_with_chromium)', | 
|   21  |   21  | 
|   22         'conditions': [ |   22         'conditions': [ | 
|   23           ['build_with_chromium==1', { |   23           ['build_with_chromium==1', { | 
|   24             'build_with_libjingle': 1, |  | 
|   25             'webrtc_root%': '<(DEPTH)/third_party/webrtc', |   24             'webrtc_root%': '<(DEPTH)/third_party/webrtc', | 
|   26             'apk_tests_path%': '<(DEPTH)/third_party/webrtc/build/apk_tests_noop
     .gyp', |   25             'apk_tests_path%': '<(DEPTH)/third_party/webrtc/build/apk_tests_noop
     .gyp', | 
|   27             'modules_java_gyp_path%': '<(DEPTH)/third_party/webrtc/modules/modul
     es_java_chromium.gyp', |   26             'modules_java_gyp_path%': '<(DEPTH)/third_party/webrtc/modules/modul
     es_java_chromium.gyp', | 
|   28           }, { |   27           }, { | 
|   29             'build_with_libjingle%': 0, |  | 
|   30             'webrtc_root%': '<(DEPTH)/webrtc', |   28             'webrtc_root%': '<(DEPTH)/webrtc', | 
|   31             'apk_tests_path%': '<(DEPTH)/webrtc/build/apk_tests.gyp', |   29             'apk_tests_path%': '<(DEPTH)/webrtc/build/apk_tests.gyp', | 
|   32             'modules_java_gyp_path%': '<(DEPTH)/webrtc/modules/modules_java.gyp'
     , |   30             'modules_java_gyp_path%': '<(DEPTH)/webrtc/modules/modules_java.gyp'
     , | 
|   33           }], |   31           }], | 
|   34         ], |   32         ], | 
|   35       }, |   33       }, | 
|   36       'build_with_chromium%': '<(build_with_chromium)', |   34       'build_with_chromium%': '<(build_with_chromium)', | 
|   37       'build_with_libjingle%': '<(build_with_libjingle)', |  | 
|   38       'webrtc_root%': '<(webrtc_root)', |   35       'webrtc_root%': '<(webrtc_root)', | 
|   39       'apk_tests_path%': '<(apk_tests_path)', |   36       'apk_tests_path%': '<(apk_tests_path)', | 
|   40       'modules_java_gyp_path%': '<(modules_java_gyp_path)', |   37       'modules_java_gyp_path%': '<(modules_java_gyp_path)', | 
|   41       'webrtc_vp8_dir%': '<(webrtc_root)/modules/video_coding/codecs/vp8', |   38       'webrtc_vp8_dir%': '<(webrtc_root)/modules/video_coding/codecs/vp8', | 
|   42       'webrtc_vp9_dir%': '<(webrtc_root)/modules/video_coding/codecs/vp9', |   39       'webrtc_vp9_dir%': '<(webrtc_root)/modules/video_coding/codecs/vp9', | 
|   43       'include_opus%': 1, |   40       'include_opus%': 1, | 
|   44       'opus_dir%': '<(DEPTH)/third_party/opus', |   41       'opus_dir%': '<(DEPTH)/third_party/opus', | 
|   45  |   42  | 
|   46       # Enable to use the Mozilla internal settings. |   43       # Enable to use the Mozilla internal settings. | 
|   47       'build_with_mozilla%': 0, |   44       'build_with_mozilla%': 0, | 
|   48     }, |   45     }, | 
|   49     'build_with_chromium%': '<(build_with_chromium)', |   46     'build_with_chromium%': '<(build_with_chromium)', | 
|   50     'build_with_libjingle%': '<(build_with_libjingle)', |  | 
|   51     'build_with_mozilla%': '<(build_with_mozilla)', |   47     'build_with_mozilla%': '<(build_with_mozilla)', | 
|   52     'webrtc_root%': '<(webrtc_root)', |   48     'webrtc_root%': '<(webrtc_root)', | 
|   53     'apk_tests_path%': '<(apk_tests_path)', |   49     'apk_tests_path%': '<(apk_tests_path)', | 
|   54     'modules_java_gyp_path%': '<(modules_java_gyp_path)', |   50     'modules_java_gyp_path%': '<(modules_java_gyp_path)', | 
|   55     'webrtc_vp8_dir%': '<(webrtc_vp8_dir)', |   51     'webrtc_vp8_dir%': '<(webrtc_vp8_dir)', | 
|   56     'webrtc_vp9_dir%': '<(webrtc_vp9_dir)', |   52     'webrtc_vp9_dir%': '<(webrtc_vp9_dir)', | 
|   57     'include_opus%': '<(include_opus)', |   53     'include_opus%': '<(include_opus)', | 
|   58     'rtc_relative_path%': 1, |   54     'rtc_relative_path%': 1, | 
|   59     'external_libraries%': '0', |   55     'external_libraries%': '0', | 
|   60     'json_root%': '<(DEPTH)/third_party/jsoncpp/source/include/', |   56     'json_root%': '<(DEPTH)/third_party/jsoncpp/source/include/', | 
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  128     'use_objc_h264%': 0, |  124     'use_objc_h264%': 0, | 
|  129  |  125  | 
|  130     'conditions': [ |  126     'conditions': [ | 
|  131       ['build_with_chromium==1', { |  127       ['build_with_chromium==1', { | 
|  132         # Exclude pulse audio on Chromium since its prerequisites don't require |  128         # Exclude pulse audio on Chromium since its prerequisites don't require | 
|  133         # pulse audio. |  129         # pulse audio. | 
|  134         'include_pulse_audio%': 0, |  130         'include_pulse_audio%': 0, | 
|  135  |  131  | 
|  136         # Exclude internal ADM since Chromium uses its own IO handling. |  132         # Exclude internal ADM since Chromium uses its own IO handling. | 
|  137         'include_internal_audio_device%': 0, |  133         'include_internal_audio_device%': 0, | 
 |  134  | 
 |  135         # Remove tests for Chromium to avoid slowing down GYP generation. | 
 |  136         'include_tests%': 0, | 
 |  137         'restrict_webrtc_logging%': 1, | 
|  138       }, {  # Settings for the standalone (not-in-Chromium) build. |  138       }, {  # Settings for the standalone (not-in-Chromium) build. | 
|  139         # TODO(andrew): For now, disable the Chrome plugins, which causes a |  139         # TODO(andrew): For now, disable the Chrome plugins, which causes a | 
|  140         # flood of chromium-style warnings. Investigate enabling them: |  140         # flood of chromium-style warnings. Investigate enabling them: | 
|  141         # http://code.google.com/p/webrtc/issues/detail?id=163 |  141         # http://code.google.com/p/webrtc/issues/detail?id=163 | 
|  142         'clang_use_chrome_plugins%': 0, |  142         'clang_use_chrome_plugins%': 0, | 
|  143  |  143  | 
|  144         'include_pulse_audio%': 1, |  144         'include_pulse_audio%': 1, | 
|  145         'include_internal_audio_device%': 1, |  145         'include_internal_audio_device%': 1, | 
|  146       }], |  | 
|  147       ['build_with_libjingle==1', { |  | 
|  148         'include_tests%': 0, |  | 
|  149         'restrict_webrtc_logging%': 1, |  | 
|  150       }, { |  | 
|  151         'include_tests%': 1, |  146         'include_tests%': 1, | 
|  152         'restrict_webrtc_logging%': 0, |  147         'restrict_webrtc_logging%': 0, | 
|  153       }], |  148       }], | 
|  154       ['OS=="ios"', { |  149       ['OS=="ios"', { | 
|  155         'build_libjpeg%': 0, |  150         'build_libjpeg%': 0, | 
|  156         'enable_protobuf%': 0, |  151         'enable_protobuf%': 0, | 
|  157       }], |  152       }], | 
|  158       ['target_arch=="arm" or target_arch=="arm64"', { |  153       ['target_arch=="arm" or target_arch=="arm64"', { | 
|  159         'prefer_fixed_point%': 1, |  154         'prefer_fixed_point%': 1, | 
|  160       }], |  155       }], | 
| (...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  445           # of a more specific macro. |  440           # of a more specific macro. | 
|  446           'defines': [ |  441           'defines': [ | 
|  447             'WEBRTC_POSIX', |  442             'WEBRTC_POSIX', | 
|  448           ], |  443           ], | 
|  449         }], |  444         }], | 
|  450       ], |  445       ], | 
|  451     }, |  446     }, | 
|  452   }, # target_defaults |  447   }, # target_defaults | 
|  453 } |  448 } | 
|  454  |  449  | 
| OLD | NEW |