| Index: third_party/opus/BUILD.gn
|
| diff --git a/third_party/opus/BUILD.gn b/third_party/opus/BUILD.gn
|
| index ce9bd4e8bde5c8d22a907bfd91d5f3d1799fbec4..8f51d09ffd4bd6f8808bf4054fbcb919465b4795 100644
|
| --- a/third_party/opus/BUILD.gn
|
| +++ b/third_party/opus/BUILD.gn
|
| @@ -4,7 +4,6 @@
|
|
|
| import("//build/config/arm.gni")
|
| import("//build/config/mips.gni")
|
| -import("//testing/test.gni")
|
|
|
| # If fixed point implementation shall be used (otherwise float).
|
| # TODO(wtc): change "mipselx" to "mipsel" in this file when the compilation
|
| @@ -25,23 +24,6 @@
|
|
|
| config("opus_config") {
|
| include_dirs = [ "src/include" ]
|
| -}
|
| -
|
| -config("opus_test_config") {
|
| - include_dirs = [
|
| - "src/celt",
|
| - "src/silk",
|
| - ]
|
| -
|
| - if (is_win) {
|
| - defines = [ "inline=__inline" ]
|
| - }
|
| - if (is_android) {
|
| - libs = [ "log" ]
|
| - }
|
| - if (is_clang) {
|
| - cflags = [ "-Wno-absolute-value" ]
|
| - }
|
| }
|
|
|
| if (use_opus_rtcd) {
|
| @@ -191,10 +173,22 @@
|
| ]
|
|
|
| configs -= [ "//build/config/compiler:chromium_code" ]
|
| - configs += [
|
| - "//build/config/compiler:no_chromium_code",
|
| - ":opus_test_config",
|
| - ]
|
| + configs += [ "//build/config/compiler:no_chromium_code" ]
|
| +
|
| + include_dirs = [
|
| + "src/celt",
|
| + "src/silk",
|
| + ]
|
| +
|
| + if (is_win) {
|
| + defines = [ "inline=__inline" ]
|
| + }
|
| + if (is_android) {
|
| + libs = [ "log" ]
|
| + }
|
| + if (is_clang) {
|
| + cflags = [ "-Wno-absolute-value" ]
|
| + }
|
|
|
| deps = [
|
| ":opus",
|
| @@ -207,84 +201,24 @@
|
| ]
|
|
|
| configs -= [ "//build/config/compiler:chromium_code" ]
|
| - configs += [
|
| - "//build/config/compiler:no_chromium_code",
|
| - ":opus_test_config",
|
| - ]
|
| + configs += [ "//build/config/compiler:no_chromium_code" ]
|
| +
|
| + include_dirs = [
|
| + "src/celt",
|
| + "src/silk",
|
| + ]
|
| +
|
| + if (is_win) {
|
| + defines = [ "inline=__inline" ]
|
| + }
|
| + if (is_android) {
|
| + libs = [ "log" ]
|
| + }
|
| + if (is_clang) {
|
| + cflags = [ "-Wno-absolute-value" ]
|
| + }
|
|
|
| deps = [
|
| ":opus",
|
| ]
|
| }
|
| -
|
| -test("test_opus_api") {
|
| - sources = [
|
| - "src/tests/test_opus_api.c",
|
| - ]
|
| -
|
| - configs -= [ "//build/config/compiler:chromium_code" ]
|
| - configs += [
|
| - "//build/config/compiler:no_chromium_code",
|
| - ":opus_test_config",
|
| - ]
|
| -
|
| - deps = [
|
| - ":opus",
|
| - ]
|
| -}
|
| -
|
| -test("test_opus_encode") {
|
| - sources = [
|
| - "src/tests/test_opus_encode.c",
|
| - ]
|
| -
|
| - configs -= [ "//build/config/compiler:chromium_code" ]
|
| - configs += [
|
| - "//build/config/compiler:no_chromium_code",
|
| - ":opus_test_config",
|
| - ]
|
| -
|
| - deps = [
|
| - ":opus",
|
| - ]
|
| -}
|
| -
|
| -test("test_opus_decode") {
|
| - sources = [
|
| - "src/tests/test_opus_decode.c",
|
| - ]
|
| -
|
| - configs -= [ "//build/config/compiler:chromium_code" ]
|
| - configs += [
|
| - "//build/config/compiler:no_chromium_code",
|
| - ":opus_test_config",
|
| - ]
|
| -
|
| - # test_opus_decode passes a null pointer to opus_decode() for an argument
|
| - # marked as requiring a non-null value by the nonnull function attribute,
|
| - # and expects opus_decode() to fail. Disable the -Wnonnull option to avoid
|
| - # a compilation error if -Werror is specified.
|
| - if (is_posix) {
|
| - cflags = [ "-Wno-nonnull" ]
|
| - }
|
| -
|
| - deps = [
|
| - ":opus",
|
| - ]
|
| -}
|
| -
|
| -test("test_opus_padding") {
|
| - sources = [
|
| - "src/tests/test_opus_padding.c",
|
| - ]
|
| -
|
| - configs -= [ "//build/config/compiler:chromium_code" ]
|
| - configs += [
|
| - "//build/config/compiler:no_chromium_code",
|
| - ":opus_test_config",
|
| - ]
|
| -
|
| - deps = [
|
| - ":opus",
|
| - ]
|
| -}
|
|
|