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/webrtc.gni") | 9 import("../../build/webrtc.gni") |
| 10 import("audio_coding.gni") | 10 import("audio_coding.gni") |
| (...skipping 523 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 534 | 534 |
| 535 public_configs = [ | 535 public_configs = [ |
| 536 "../..:common_inherited_config", | 536 "../..:common_inherited_config", |
| 537 ":isac_config", | 537 ":isac_config", |
| 538 ] | 538 ] |
| 539 | 539 |
| 540 deps = [ | 540 deps = [ |
| 541 ":audio_decoder_interface", | 541 ":audio_decoder_interface", |
| 542 ":audio_encoder_interface", | 542 ":audio_encoder_interface", |
| 543 ":isac_common", | 543 ":isac_common", |
| 544 "../..:webrtc_common", | |
| 544 "../../common_audio", | 545 "../../common_audio", |
| 545 ] | 546 ] |
| 546 } | 547 } |
| 547 | 548 |
| 548 config("isac_fix_config") { | 549 config("isac_fix_config") { |
| 549 include_dirs = [ | 550 include_dirs = [ |
| 550 "../../..", | 551 "../../..", |
| 551 "codecs/isac/fix/include", | 552 "codecs/isac/fix/include", |
| 552 ] | 553 ] |
| 553 } | 554 } |
| (...skipping 1021 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1575 | 1576 |
| 1576 sources = [ | 1577 sources = [ |
| 1577 "codecs/g711/test/testG711.cc", | 1578 "codecs/g711/test/testG711.cc", |
| 1578 ] | 1579 ] |
| 1579 | 1580 |
| 1580 configs += [ "../..:common_config" ] | 1581 configs += [ "../..:common_config" ] |
| 1581 public_configs = [ "../..:common_inherited_config" ] | 1582 public_configs = [ "../..:common_inherited_config" ] |
| 1582 | 1583 |
| 1583 deps = [ | 1584 deps = [ |
| 1584 ":g711", | 1585 ":g711", |
| 1586 "//build/config/sanitizers:deps", | |
|
aleloi
2016/08/24 11:02:51
Added dependence to :isac in order for it to pass
| |
| 1585 ] | 1587 ] |
| 1586 } | 1588 } |
| 1587 | 1589 |
| 1588 executable("g722_test") { | 1590 executable("g722_test") { |
| 1589 testonly = true | 1591 testonly = true |
| 1590 | 1592 |
| 1591 sources = [ | 1593 sources = [ |
| 1592 "codecs/g722/test/testG722.cc", | 1594 "codecs/g722/test/testG722.cc", |
| 1593 ] | 1595 ] |
| 1594 | 1596 |
| 1595 configs += [ "../..:common_config" ] | 1597 configs += [ "../..:common_config" ] |
| 1596 public_configs = [ "../..:common_inherited_config" ] | 1598 public_configs = [ "../..:common_inherited_config" ] |
| 1597 | 1599 |
| 1598 deps = [ | 1600 deps = [ |
| 1599 ":g722", | 1601 ":g722", |
| 1600 "../..:webrtc_common", | 1602 "../..:webrtc_common", |
| 1603 "//build/config/sanitizers:deps", | |
|
aleloi
2016/08/24 11:02:51
Added sanitizers deps to executable.
| |
| 1604 ] | |
| 1605 } | |
| 1606 | |
| 1607 executable("isac_api_test") { | |
| 1608 testonly = true | |
| 1609 | |
| 1610 sources = [ | |
| 1611 "codecs/isac/main/test/ReleaseTest-API/ReleaseTest-API.cc", | |
| 1612 "codecs/isac/main/util/utility.c", | |
| 1613 ] | |
| 1614 | |
| 1615 deps = [ | |
|
kjellander_webrtc
2016/08/26 14:07:37
For all three targets, please add:
configs += [ "
| |
| 1616 ":isac", | |
| 1617 "../../base:rtc_base", | |
|
aleloi
2016/08/24 11:02:51
'Forbidden' dependency; also added matching depend
kjellander_webrtc
2016/08/26 14:07:37
Do you need rtc_base or is rtc_base_approved enoug
aleloi
2016/08/29 09:39:10
Yes, rtc_base is needed. Specifically webrtc/base/
aleloi
2016/08/29 10:57:29
Actually, ivoc@ broke out format_macros.h from rtc
| |
| 1618 "//build/config/sanitizers:deps", | |
| 1619 ] | |
| 1620 | |
| 1621 include_dirs = [ | |
| 1622 "codecs/isac/main/test", | |
| 1623 "codecs/isac/main/include", | |
|
kjellander_webrtc
2016/08/26 14:07:37
nit: sort includes
aleloi
2016/08/29 09:39:10
Done.
| |
| 1624 "codecs/isac/main/util", | |
| 1625 ] | |
| 1626 } | |
| 1627 | |
| 1628 executable("isac_switch_samprate_test") { | |
| 1629 testonly = true | |
| 1630 | |
| 1631 sources = [ | |
| 1632 "codecs/isac/main/test/SwitchingSampRate/SwitchingSampRate.cc", | |
| 1633 "codecs/isac/main/util/utility.c", | |
| 1634 ] | |
| 1635 | |
| 1636 deps = [ | |
| 1637 ":isac", | |
| 1638 "//build/config/sanitizers:deps", | |
| 1639 ] | |
| 1640 | |
| 1641 include_dirs = [ | |
| 1642 "codecs/isac/main/test", | |
| 1643 "codecs/isac/main/include", | |
|
kjellander_webrtc
2016/08/26 14:07:38
nit: sort includes.
aleloi
2016/08/29 09:39:10
Done.
| |
| 1644 "../../common_audio/signal_processing/include", | |
| 1645 "codecs/isac/main/util", | |
| 1646 ] | |
| 1647 } | |
| 1648 | |
| 1649 executable("ilbc_test") { | |
| 1650 testonly = true | |
| 1651 | |
| 1652 sources = [ | |
| 1653 "codecs/ilbc/test/iLBC_test.c", | |
| 1654 ] | |
| 1655 | |
| 1656 deps = [ | |
| 1657 ":ilbc", | |
| 1658 "//build/config/sanitizers:deps", | |
| 1601 ] | 1659 ] |
| 1602 } | 1660 } |
| 1603 } | 1661 } |
| OLD | NEW |