| OLD | NEW |
| 1 # Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. | 1 # Copyright (c) 2014 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 # TODO(kjellander): Rebase this to webrtc/build/common.gypi changes after r6330. | 9 # TODO(kjellander): Rebase this to webrtc/build/common.gypi changes after r6330. |
| 10 | 10 |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 93 # if (is_freebsd) { | 93 # if (is_freebsd) { |
| 94 # defines += [ "FREEBSD" ] | 94 # defines += [ "FREEBSD" ] |
| 95 # } | 95 # } |
| 96 } | 96 } |
| 97 | 97 |
| 98 config("common_config") { | 98 config("common_config") { |
| 99 cflags = [] | 99 cflags = [] |
| 100 cflags_cc = [] | 100 cflags_cc = [] |
| 101 defines = [] | 101 defines = [] |
| 102 | 102 |
| 103 if (rtc_enable_protobuf) { | |
| 104 defines += [ "WEBRTC_ENABLE_PROTOBUF=1" ] | |
| 105 } else { | |
| 106 defines += [ "WEBRTC_ENABLE_PROTOBUF=0" ] | |
| 107 } | |
| 108 | |
| 109 if (rtc_restrict_logging) { | 103 if (rtc_restrict_logging) { |
| 110 defines += [ "WEBRTC_RESTRICT_LOGGING" ] | 104 defines += [ "WEBRTC_RESTRICT_LOGGING" ] |
| 111 } | 105 } |
| 112 | 106 |
| 113 if (rtc_include_internal_audio_device) { | 107 if (rtc_include_internal_audio_device) { |
| 114 defines += [ "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE" ] | 108 defines += [ "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE" ] |
| 115 } | 109 } |
| 116 | 110 |
| 117 if (rtc_relative_path) { | 111 if (rtc_relative_path) { |
| 118 defines += [ "EXPAT_RELATIVE_PATH" ] | 112 defines += [ "EXPAT_RELATIVE_PATH" ] |
| (...skipping 387 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 506 ] | 500 ] |
| 507 | 501 |
| 508 deps = [ | 502 deps = [ |
| 509 "//base:base_java_test_support", | 503 "//base:base_java_test_support", |
| 510 "//webrtc/examples:AppRTCMobile_javalib", | 504 "//webrtc/examples:AppRTCMobile_javalib", |
| 511 "//webrtc/sdk/android:libjingle_peerconnection_java", | 505 "//webrtc/sdk/android:libjingle_peerconnection_java", |
| 512 ] | 506 ] |
| 513 } | 507 } |
| 514 } | 508 } |
| 515 } | 509 } |
| OLD | NEW |