| Index: build/secondary/third_party/libsrtp/BUILD.gn
|
| diff --git a/build/secondary/third_party/libsrtp/BUILD.gn b/build/secondary/third_party/libsrtp/BUILD.gn
|
| index 7601bea0d64c2659b08d51e00402777614091ce9..23490f44a5aca9f55ca4518d18bbdcb194ce0c11 100644
|
| --- a/build/secondary/third_party/libsrtp/BUILD.gn
|
| +++ b/build/secondary/third_party/libsrtp/BUILD.gn
|
| @@ -43,16 +43,6 @@ config("libsrtp_config") {
|
| cflags = [ "-Wno-unused-variable" ]
|
| }
|
|
|
| - if (is_win) {
|
| - defines += [
|
| - "HAVE_BYTESWAP_METHODS_H",
|
| -
|
| - # All Windows architectures are this way.
|
| - "SIZEOF_UNSIGNED_LONG=4",
|
| - "SIZEOF_UNSIGNED_LONG_LONG=8",
|
| - ]
|
| - }
|
| -
|
| if (current_cpu == "x64" || current_cpu == "x86" || current_cpu == "arm") {
|
| defines += [
|
| # TODO(leozwang): CPU_RISC doesn"t work properly on android/arm
|
| @@ -183,209 +173,205 @@ if (use_system_libsrtp) {
|
| }
|
| }
|
|
|
| - # TODO(GYP): A bunch of these tests don't compile (in gyp either). They're
|
| - # not very broken, so could probably be made to work if it's useful.
|
| - if (!is_win) {
|
| - executable("rdbx_driver") {
|
| - configs -= [ "//build/config/compiler:chromium_code" ]
|
| - configs += [ "//build/config/compiler:no_chromium_code" ]
|
| - deps = [
|
| - ":libsrtp",
|
| - ]
|
| - sources = [
|
| - "srtp/include/getopt_s.h",
|
| - "srtp/test/getopt_s.c",
|
| - "srtp/test/rdbx_driver.c",
|
| - ]
|
| - }
|
| + executable("rdbx_driver") {
|
| + configs -= [ "//build/config/compiler:chromium_code" ]
|
| + configs += [ "//build/config/compiler:no_chromium_code" ]
|
| + deps = [
|
| + ":libsrtp",
|
| + ]
|
| + sources = [
|
| + "srtp/include/getopt_s.h",
|
| + "srtp/test/getopt_s.c",
|
| + "srtp/test/rdbx_driver.c",
|
| + ]
|
| + }
|
|
|
| - executable("srtp_driver") {
|
| - configs -= [ "//build/config/compiler:chromium_code" ]
|
| - configs += [ "//build/config/compiler:no_chromium_code" ]
|
| - deps = [
|
| - ":libsrtp",
|
| - ]
|
| - sources = [
|
| - "srtp/include/getopt_s.h",
|
| - "srtp/include/srtp_priv.h",
|
| - "srtp/test/getopt_s.c",
|
| - "srtp/test/srtp_driver.c",
|
| - ]
|
| - }
|
| + executable("srtp_driver") {
|
| + configs -= [ "//build/config/compiler:chromium_code" ]
|
| + configs += [ "//build/config/compiler:no_chromium_code" ]
|
| + deps = [
|
| + ":libsrtp",
|
| + ]
|
| + sources = [
|
| + "srtp/include/getopt_s.h",
|
| + "srtp/include/srtp_priv.h",
|
| + "srtp/test/getopt_s.c",
|
| + "srtp/test/srtp_driver.c",
|
| + ]
|
| + }
|
|
|
| - executable("roc_driver") {
|
| - configs -= [ "//build/config/compiler:chromium_code" ]
|
| - configs += [ "//build/config/compiler:no_chromium_code" ]
|
| - deps = [
|
| - ":libsrtp",
|
| - ]
|
| - sources = [
|
| - "srtp/crypto/include/rdbx.h",
|
| - "srtp/include/ut_sim.h",
|
| - "srtp/test/roc_driver.c",
|
| - ]
|
| - }
|
| + executable("roc_driver") {
|
| + configs -= [ "//build/config/compiler:chromium_code" ]
|
| + configs += [ "//build/config/compiler:no_chromium_code" ]
|
| + deps = [
|
| + ":libsrtp",
|
| + ]
|
| + sources = [
|
| + "srtp/crypto/include/rdbx.h",
|
| + "srtp/include/ut_sim.h",
|
| + "srtp/test/roc_driver.c",
|
| + ]
|
| + }
|
|
|
| - executable("replay_driver") {
|
| - configs -= [ "//build/config/compiler:chromium_code" ]
|
| - configs += [ "//build/config/compiler:no_chromium_code" ]
|
| - deps = [
|
| - ":libsrtp",
|
| - ]
|
| - sources = [
|
| - "srtp/crypto/include/rdbx.h",
|
| - "srtp/include/ut_sim.h",
|
| - "srtp/test/replay_driver.c",
|
| - ]
|
| - }
|
| + executable("replay_driver") {
|
| + configs -= [ "//build/config/compiler:chromium_code" ]
|
| + configs += [ "//build/config/compiler:no_chromium_code" ]
|
| + deps = [
|
| + ":libsrtp",
|
| + ]
|
| + sources = [
|
| + "srtp/crypto/include/rdbx.h",
|
| + "srtp/include/ut_sim.h",
|
| + "srtp/test/replay_driver.c",
|
| + ]
|
| + }
|
|
|
| - executable("rtpw") {
|
| - configs -= [ "//build/config/compiler:chromium_code" ]
|
| - configs += [ "//build/config/compiler:no_chromium_code" ]
|
| - deps = [
|
| - ":libsrtp",
|
| - ]
|
| - sources = [
|
| - "srtp/crypto/include/datatypes.h",
|
| - "srtp/include/getopt_s.h",
|
| - "srtp/include/rtp.h",
|
| - "srtp/include/srtp.h",
|
| - "srtp/test/getopt_s.c",
|
| - "srtp/test/rtp.c",
|
| - "srtp/test/rtpw.c",
|
| - ]
|
| - if (is_android) {
|
| - defines = [ "HAVE_SYS_SOCKET_H" ]
|
| - }
|
| - if (is_clang) {
|
| - cflags = [ "-Wno-implicit-function-declaration" ]
|
| - }
|
| + executable("rtpw") {
|
| + configs -= [ "//build/config/compiler:chromium_code" ]
|
| + configs += [ "//build/config/compiler:no_chromium_code" ]
|
| + deps = [
|
| + ":libsrtp",
|
| + ]
|
| + sources = [
|
| + "srtp/crypto/include/datatypes.h",
|
| + "srtp/include/getopt_s.h",
|
| + "srtp/include/rtp.h",
|
| + "srtp/include/srtp.h",
|
| + "srtp/test/getopt_s.c",
|
| + "srtp/test/rtp.c",
|
| + "srtp/test/rtpw.c",
|
| + ]
|
| + if (is_android) {
|
| + defines = [ "HAVE_SYS_SOCKET_H" ]
|
| }
|
| -
|
| - executable("srtp_test_cipher_driver") {
|
| - configs -= [ "//build/config/compiler:chromium_code" ]
|
| - configs += [ "//build/config/compiler:no_chromium_code" ]
|
| - deps = [
|
| - ":libsrtp",
|
| - ]
|
| - sources = [
|
| - "srtp/crypto/test/cipher_driver.c",
|
| - "srtp/include/getopt_s.h",
|
| - "srtp/test/getopt_s.c",
|
| - ]
|
| + if (is_clang) {
|
| + cflags = [ "-Wno-implicit-function-declaration" ]
|
| }
|
| + }
|
|
|
| - executable("srtp_test_datatypes_driver") {
|
| - configs -= [ "//build/config/compiler:chromium_code" ]
|
| - configs += [ "//build/config/compiler:no_chromium_code" ]
|
| - deps = [
|
| - ":libsrtp",
|
| - ]
|
| - sources = [
|
| - "srtp/crypto/test/datatypes_driver.c",
|
| - ]
|
| - }
|
| + executable("srtp_test_cipher_driver") {
|
| + configs -= [ "//build/config/compiler:chromium_code" ]
|
| + configs += [ "//build/config/compiler:no_chromium_code" ]
|
| + deps = [
|
| + ":libsrtp",
|
| + ]
|
| + sources = [
|
| + "srtp/crypto/test/cipher_driver.c",
|
| + "srtp/include/getopt_s.h",
|
| + "srtp/test/getopt_s.c",
|
| + ]
|
| + }
|
|
|
| - executable("srtp_test_stat_driver") {
|
| - configs -= [ "//build/config/compiler:chromium_code" ]
|
| - configs += [ "//build/config/compiler:no_chromium_code" ]
|
| - deps = [
|
| - ":libsrtp",
|
| - ]
|
| - sources = [
|
| - "srtp/crypto/test/stat_driver.c",
|
| - ]
|
| - }
|
| + executable("srtp_test_datatypes_driver") {
|
| + configs -= [ "//build/config/compiler:chromium_code" ]
|
| + configs += [ "//build/config/compiler:no_chromium_code" ]
|
| + deps = [
|
| + ":libsrtp",
|
| + ]
|
| + sources = [
|
| + "srtp/crypto/test/datatypes_driver.c",
|
| + ]
|
| + }
|
|
|
| - executable("srtp_test_sha1_driver") {
|
| - configs -= [ "//build/config/compiler:chromium_code" ]
|
| - configs += [ "//build/config/compiler:no_chromium_code" ]
|
| - deps = [
|
| - ":libsrtp",
|
| - ]
|
| - sources = [
|
| - "srtp/crypto/test/sha1_driver.c",
|
| - ]
|
| - }
|
| + executable("srtp_test_stat_driver") {
|
| + configs -= [ "//build/config/compiler:chromium_code" ]
|
| + configs += [ "//build/config/compiler:no_chromium_code" ]
|
| + deps = [
|
| + ":libsrtp",
|
| + ]
|
| + sources = [
|
| + "srtp/crypto/test/stat_driver.c",
|
| + ]
|
| + }
|
|
|
| - executable("srtp_test_kernel_driver") {
|
| - configs -= [ "//build/config/compiler:chromium_code" ]
|
| - configs += [ "//build/config/compiler:no_chromium_code" ]
|
| - deps = [
|
| - ":libsrtp",
|
| - ]
|
| - sources = [
|
| - "srtp/crypto/test/kernel_driver.c",
|
| - "srtp/include/getopt_s.h",
|
| - "srtp/test/getopt_s.c",
|
| - ]
|
| - }
|
| + executable("srtp_test_sha1_driver") {
|
| + configs -= [ "//build/config/compiler:chromium_code" ]
|
| + configs += [ "//build/config/compiler:no_chromium_code" ]
|
| + deps = [
|
| + ":libsrtp",
|
| + ]
|
| + sources = [
|
| + "srtp/crypto/test/sha1_driver.c",
|
| + ]
|
| + }
|
|
|
| - executable("srtp_test_aes_calc") {
|
| - configs -= [ "//build/config/compiler:chromium_code" ]
|
| - configs += [ "//build/config/compiler:no_chromium_code" ]
|
| - deps = [
|
| - ":libsrtp",
|
| - ]
|
| - sources = [
|
| - "srtp/crypto/test/aes_calc.c",
|
| - ]
|
| - }
|
| + executable("srtp_test_kernel_driver") {
|
| + configs -= [ "//build/config/compiler:chromium_code" ]
|
| + configs += [ "//build/config/compiler:no_chromium_code" ]
|
| + deps = [
|
| + ":libsrtp",
|
| + ]
|
| + sources = [
|
| + "srtp/crypto/test/kernel_driver.c",
|
| + "srtp/include/getopt_s.h",
|
| + "srtp/test/getopt_s.c",
|
| + ]
|
| + }
|
|
|
| - executable("srtp_test_rand_gen") {
|
| - configs -= [ "//build/config/compiler:chromium_code" ]
|
| - configs += [ "//build/config/compiler:no_chromium_code" ]
|
| - deps = [
|
| - ":libsrtp",
|
| - ]
|
| - sources = [
|
| - "srtp/crypto/test/rand_gen.c",
|
| - "srtp/include/getopt_s.h",
|
| - "srtp/test/getopt_s.c",
|
| - ]
|
| - }
|
| + executable("srtp_test_aes_calc") {
|
| + configs -= [ "//build/config/compiler:chromium_code" ]
|
| + configs += [ "//build/config/compiler:no_chromium_code" ]
|
| + deps = [
|
| + ":libsrtp",
|
| + ]
|
| + sources = [
|
| + "srtp/crypto/test/aes_calc.c",
|
| + ]
|
| + }
|
|
|
| - executable("srtp_test_rand_gen_soak") {
|
| - configs -= [ "//build/config/compiler:chromium_code" ]
|
| - configs += [ "//build/config/compiler:no_chromium_code" ]
|
| - deps = [
|
| - ":libsrtp",
|
| - ]
|
| - sources = [
|
| - "srtp/crypto/test/rand_gen_soak.c",
|
| - "srtp/include/getopt_s.h",
|
| - "srtp/test/getopt_s.c",
|
| - ]
|
| - }
|
| + executable("srtp_test_rand_gen") {
|
| + configs -= [ "//build/config/compiler:chromium_code" ]
|
| + configs += [ "//build/config/compiler:no_chromium_code" ]
|
| + deps = [
|
| + ":libsrtp",
|
| + ]
|
| + sources = [
|
| + "srtp/crypto/test/rand_gen.c",
|
| + "srtp/include/getopt_s.h",
|
| + "srtp/test/getopt_s.c",
|
| + ]
|
| + }
|
|
|
| - executable("srtp_test_env") {
|
| - configs -= [ "//build/config/compiler:chromium_code" ]
|
| - configs += [ "//build/config/compiler:no_chromium_code" ]
|
| - deps = [
|
| - ":libsrtp",
|
| - ]
|
| - sources = [
|
| - "srtp/crypto/test/env.c",
|
| - ]
|
| - }
|
| + executable("srtp_test_rand_gen_soak") {
|
| + configs -= [ "//build/config/compiler:chromium_code" ]
|
| + configs += [ "//build/config/compiler:no_chromium_code" ]
|
| + deps = [
|
| + ":libsrtp",
|
| + ]
|
| + sources = [
|
| + "srtp/crypto/test/rand_gen_soak.c",
|
| + "srtp/include/getopt_s.h",
|
| + "srtp/test/getopt_s.c",
|
| + ]
|
| + }
|
|
|
| - group("srtp_runtest") {
|
| - deps = [
|
| - ":rdbx_driver",
|
| - ":srtp_driver",
|
| - ":roc_driver",
|
| - ":replay_driver",
|
| - ":rtpw",
|
| - ":srtp_test_cipher_driver",
|
| - ":srtp_test_datatypes_driver",
|
| - ":srtp_test_stat_driver",
|
| - ":srtp_test_sha1_driver",
|
| - ":srtp_test_kernel_driver",
|
| - ":srtp_test_aes_calc",
|
| - ":srtp_test_rand_gen",
|
| - ":srtp_test_rand_gen_soak",
|
| - ":srtp_test_env",
|
| - ]
|
| - }
|
| + executable("srtp_test_env") {
|
| + configs -= [ "//build/config/compiler:chromium_code" ]
|
| + configs += [ "//build/config/compiler:no_chromium_code" ]
|
| + deps = [
|
| + ":libsrtp",
|
| + ]
|
| + sources = [
|
| + "srtp/crypto/test/env.c",
|
| + ]
|
| + }
|
| +
|
| + group("srtp_runtest") {
|
| + deps = [
|
| + ":rdbx_driver",
|
| + ":srtp_driver",
|
| + ":roc_driver",
|
| + ":replay_driver",
|
| + ":rtpw",
|
| + ":srtp_test_cipher_driver",
|
| + ":srtp_test_datatypes_driver",
|
| + ":srtp_test_stat_driver",
|
| + ":srtp_test_sha1_driver",
|
| + ":srtp_test_kernel_driver",
|
| + ":srtp_test_aes_calc",
|
| + ":srtp_test_rand_gen",
|
| + ":srtp_test_rand_gen_soak",
|
| + ":srtp_test_env",
|
| + ]
|
| }
|
| }
|
|
|