Chromium Code Reviews| 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 import("//build/config/arm.gni") | 9 import("//build/config/arm.gni") |
| 10 import("../../build/webrtc.gni") | 10 import("../../build/webrtc.gni") |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 60 | 60 |
| 61 if (is_clang) { | 61 if (is_clang) { |
| 62 # Suppress warnings from Chrome's Clang plugins. | 62 # Suppress warnings from Chrome's Clang plugins. |
| 63 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 63 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
| 64 configs -= [ "//build/config/clang:find_bad_constructs" ] | 64 configs -= [ "//build/config/clang:find_bad_constructs" ] |
| 65 } | 65 } |
| 66 | 66 |
| 67 deps = [ | 67 deps = [ |
| 68 ":cng", | 68 ":cng", |
| 69 ":g711", | 69 ":g711", |
| 70 ":g722", | |
| 71 ":ilbc", | |
| 72 ":isac", | |
| 73 ":isac_fix", | |
| 74 ":neteq", | 70 ":neteq", |
| 75 ":pcm16b", | 71 ":pcm16b", |
| 76 ":red", | |
| 77 "../..:rtc_event_log", | 72 "../..:rtc_event_log", |
| 78 "../..:webrtc_common", | 73 "../..:webrtc_common", |
| 79 "../../common_audio", | 74 "../../common_audio", |
| 80 "../../system_wrappers", | 75 "../../system_wrappers", |
| 81 ] | 76 ] |
| 82 | 77 |
| 83 if (rtc_include_opus) { | 78 if (rtc_include_opus) { |
| 84 defines += [ "WEBRTC_CODEC_OPUS" ] | 79 defines += [ "WEBRTC_CODEC_OPUS" ] |
| 85 deps += [ ":webrtc_opus" ] | 80 deps += [ ":webrtc_opus" ] |
| 86 } | 81 } |
| 82 if (!build_with_mozilla) { | |
|
kjellander_webrtc
2015/09/22 11:01:28
Since line 82-92 is duplicated below, maybe you ca
kwiberg-webrtc
2015/09/22 12:05:14
Will do this in a later CL (see discussion below).
| |
| 83 if (current_cpu == "arm") { | |
|
kjellander_webrtc
2015/09/22 11:01:28
or current_cpu=="arm64" ?
kwiberg-webrtc
2015/09/22 12:05:14
Well, that might make sense. But it won't preserve
kjellander_webrtc
2015/09/22 12:35:25
I see. I thought WEBRTC_ARCH_ARM was defined for b
| |
| 84 defines += [ "WEBRTC_CODEC_ISACFX" ] | |
| 85 deps += [ ":isac_fix" ] | |
| 86 } else { | |
| 87 defines += [ "WEBRTC_CODEC_ISAC" ] | |
| 88 deps += [ ":isac" ] | |
| 89 } | |
| 90 defines += [ "WEBRTC_CODEC_G722" ] | |
| 91 deps += [ ":g722" ] | |
| 92 } | |
| 93 if (!build_with_mozilla && !build_with_chromium) { | |
| 94 defines += [ | |
| 95 "WEBRTC_CODEC_ILBC", | |
| 96 "WEBRTC_CODEC_RED", | |
| 97 ] | |
| 98 deps += [ | |
| 99 ":ilbc", | |
| 100 ":red", | |
| 101 ] | |
| 102 } | |
| 87 } | 103 } |
| 88 | 104 |
| 89 source_set("audio_decoder_interface") { | 105 source_set("audio_decoder_interface") { |
| 90 sources = [ | 106 sources = [ |
| 91 "codecs/audio_decoder.cc", | 107 "codecs/audio_decoder.cc", |
| 92 "codecs/audio_decoder.h", | 108 "codecs/audio_decoder.h", |
| 93 ] | 109 ] |
| 94 configs += [ "../..:common_config" ] | 110 configs += [ "../..:common_config" ] |
| 95 public_configs = [ "../..:common_inherited_config" ] | 111 public_configs = [ "../..:common_inherited_config" ] |
| 96 deps = [ | 112 deps = [ |
| (...skipping 684 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 781 | 797 |
| 782 public_configs = [ | 798 public_configs = [ |
| 783 "../..:common_inherited_config", | 799 "../..:common_inherited_config", |
| 784 ":neteq_config", | 800 ":neteq_config", |
| 785 ] | 801 ] |
| 786 | 802 |
| 787 deps = [ | 803 deps = [ |
| 788 ":audio_decoder_interface", | 804 ":audio_decoder_interface", |
| 789 ":cng", | 805 ":cng", |
| 790 ":g711", | 806 ":g711", |
| 791 ":g722", | |
| 792 ":ilbc", | |
| 793 ":isac", | |
| 794 ":isac_fix", | |
| 795 ":pcm16b", | 807 ":pcm16b", |
| 796 "../..:webrtc_common", | 808 "../..:webrtc_common", |
| 797 "../../common_audio", | 809 "../../common_audio", |
| 798 "../../system_wrappers", | 810 "../../system_wrappers", |
| 799 ] | 811 ] |
| 800 | 812 |
| 801 defines = [] | 813 defines = [] |
| 802 | 814 |
| 803 if (rtc_include_opus) { | 815 if (rtc_include_opus) { |
| 804 defines += [ "WEBRTC_CODEC_OPUS" ] | 816 defines += [ "WEBRTC_CODEC_OPUS" ] |
| 805 deps += [ ":webrtc_opus" ] | 817 deps += [ ":webrtc_opus" ] |
| 806 } | 818 } |
| 819 if (!build_with_mozilla) { | |
| 820 if (current_cpu == "arm") { | |
|
kjellander_webrtc
2015/09/22 11:01:28
arm64 as well.
kwiberg-webrtc
2015/09/22 12:05:14
Not in this CL; see above.
kjellander_webrtc
2015/09/22 12:35:25
Fair enough.
| |
| 821 defines += [ "WEBRTC_CODEC_ISACFX" ] | |
| 822 deps += [ ":isac_fix" ] | |
| 823 } else { | |
| 824 defines += [ "WEBRTC_CODEC_ISAC" ] | |
| 825 deps += [ ":isac" ] | |
| 826 } | |
| 827 defines += [ "WEBRTC_CODEC_G722" ] | |
| 828 deps += [ ":g722" ] | |
| 829 } | |
| 830 if (!build_with_mozilla && !build_with_chromium) { | |
| 831 defines += [ "WEBRTC_CODEC_ILBC" ] | |
| 832 deps += [ ":ilbc" ] | |
| 833 } | |
|
kwiberg-webrtc
2015/09/22 08:37:15
This duplication will go away soon; I'm just about
hlundin-webrtc
2015/09/22 09:09:17
Acknowledged.
| |
| 807 } | 834 } |
| OLD | NEW |