Chromium Code Reviews| 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 1cd2a779d66eb979adb91257f3c444b13525d7c2..ba6dba09f7b8a41168efbb29e7308025a807761b 100644 |
| --- a/build/secondary/third_party/libsrtp/BUILD.gn |
| +++ b/build/secondary/third_party/libsrtp/BUILD.gn |
| @@ -144,169 +144,173 @@ if (use_system_libsrtp) { |
| ] |
| } |
| - executable("rdbx_driver") { |
| - configs -= [ "//build/config/compiler:chromium_code" ] |
| - configs += [ "//build/config/compiler:no_chromium_code" ] |
| - configs += [ ":libsrtp_config" ] |
| - deps = [ ":libsrtp" ] |
| - sources = [ |
| - "srtp/include/getopt_s.h", |
| - "srtp/test/getopt_s.c", |
| - "srtp/test/rdbx_driver.c", |
| - ] |
| - } |
| + # 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" ] |
| + configs += [ ":libsrtp_config" ] |
| + 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" ] |
| - configs += [ ":libsrtp_config" ] |
| - 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" ] |
| + configs += [ ":libsrtp_config" ] |
| + 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" ] |
| - configs += [ ":libsrtp_config" ] |
| - 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" ] |
| + configs += [ ":libsrtp_config" ] |
| + 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" ] |
| - configs += [ ":libsrtp_config" ] |
| - 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" ] |
| + configs += [ ":libsrtp_config" ] |
| + 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" ] |
| - configs += [ ":libsrtp_config" ] |
| - deps = [ ":libsrtp" ] |
| - sources = [ |
| - "srtp/include/getopt_s.h", |
| - "srtp/include/rtp.h", |
| - "srtp/include/srtp.h", |
| - "srtp/crypto/include/datatypes.h", |
| - "srtp/test/getopt_s.c", |
| - "srtp/test/rtp.c", |
| - "srtp/test/rtpw.c", |
| - ] |
| - if (is_android) { |
| - defines = [ "HAVE_SYS_SOCKET_H" ] |
| + executable("rtpw") { |
|
scottmg
2014/07/30 20:01:07
There's no changes here, just indenting. I'm not s
|
| + configs -= [ "//build/config/compiler:chromium_code" ] |
| + configs += [ "//build/config/compiler:no_chromium_code" ] |
| + configs += [ ":libsrtp_config" ] |
| + deps = [ ":libsrtp" ] |
| + sources = [ |
| + "srtp/include/getopt_s.h", |
| + "srtp/include/rtp.h", |
| + "srtp/include/srtp.h", |
| + "srtp/crypto/include/datatypes.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" ] |
| - configs += [ ":libsrtp_config" ] |
| - deps = [ ":libsrtp" ] |
| - sources = [ |
| - "srtp/crypto/test/cipher_driver.c", |
| - ] |
| - } |
| + executable("srtp_test_cipher_driver") { |
| + configs -= [ "//build/config/compiler:chromium_code" ] |
| + configs += [ "//build/config/compiler:no_chromium_code" ] |
| + configs += [ ":libsrtp_config" ] |
| + deps = [ ":libsrtp" ] |
| + sources = [ |
| + "srtp/crypto/test/cipher_driver.c", |
| + ] |
| + } |
| - executable("srtp_test_datatypes_driver") { |
| - configs -= [ "//build/config/compiler:chromium_code" ] |
| - configs += [ "//build/config/compiler:no_chromium_code" ] |
| - configs += [ ":libsrtp_config" ] |
| - deps = [ ":libsrtp" ] |
| - sources = [ |
| - "srtp/crypto/test/datatypes_driver.c", |
| - ] |
| - } |
| + executable("srtp_test_datatypes_driver") { |
| + configs -= [ "//build/config/compiler:chromium_code" ] |
| + configs += [ "//build/config/compiler:no_chromium_code" ] |
| + configs += [ ":libsrtp_config" ] |
| + deps = [ ":libsrtp" ] |
| + sources = [ |
| + "srtp/crypto/test/datatypes_driver.c", |
| + ] |
| + } |
| - executable("srtp_test_stat_driver") { |
| - configs -= [ "//build/config/compiler:chromium_code" ] |
| - configs += [ "//build/config/compiler:no_chromium_code" ] |
| - configs += [ ":libsrtp_config" ] |
| - deps = [ ":libsrtp" ] |
| - sources = [ |
| - "srtp/crypto/test/stat_driver.c", |
| - ] |
| - } |
| + executable("srtp_test_stat_driver") { |
| + configs -= [ "//build/config/compiler:chromium_code" ] |
| + configs += [ "//build/config/compiler:no_chromium_code" ] |
| + configs += [ ":libsrtp_config" ] |
| + deps = [ ":libsrtp" ] |
| + sources = [ |
| + "srtp/crypto/test/stat_driver.c", |
| + ] |
| + } |
| - executable("srtp_test_sha1_driver") { |
| - configs -= [ "//build/config/compiler:chromium_code" ] |
| - configs += [ "//build/config/compiler:no_chromium_code" ] |
| - configs += [ ":libsrtp_config" ] |
| - deps = [ ":libsrtp" ] |
| - sources = [ |
| - "srtp/crypto/test/sha1_driver.c", |
| - ] |
| - } |
| + executable("srtp_test_sha1_driver") { |
| + configs -= [ "//build/config/compiler:chromium_code" ] |
| + configs += [ "//build/config/compiler:no_chromium_code" ] |
| + configs += [ ":libsrtp_config" ] |
| + deps = [ ":libsrtp" ] |
| + sources = [ |
| + "srtp/crypto/test/sha1_driver.c", |
| + ] |
| + } |
| - executable("srtp_test_kernel_driver") { |
| - configs -= [ "//build/config/compiler:chromium_code" ] |
| - configs += [ "//build/config/compiler:no_chromium_code" ] |
| - configs += [ ":libsrtp_config" ] |
| - deps = [ ":libsrtp" ] |
| - sources = [ |
| - "srtp/crypto/test/kernel_driver.c", |
| - ] |
| - } |
| + executable("srtp_test_kernel_driver") { |
| + configs -= [ "//build/config/compiler:chromium_code" ] |
| + configs += [ "//build/config/compiler:no_chromium_code" ] |
| + configs += [ ":libsrtp_config" ] |
| + deps = [ ":libsrtp" ] |
| + sources = [ |
| + "srtp/crypto/test/kernel_driver.c", |
| + ] |
| + } |
| - executable("srtp_test_aes_calc") { |
| - configs -= [ "//build/config/compiler:chromium_code" ] |
| - configs += [ "//build/config/compiler:no_chromium_code" ] |
| - configs += [ ":libsrtp_config" ] |
| - deps = [ ":libsrtp" ] |
| - sources = [ |
| - "srtp/crypto/test/aes_calc.c", |
| - ] |
| - } |
| + executable("srtp_test_aes_calc") { |
| + configs -= [ "//build/config/compiler:chromium_code" ] |
| + configs += [ "//build/config/compiler:no_chromium_code" ] |
| + configs += [ ":libsrtp_config" ] |
| + deps = [ ":libsrtp" ] |
| + sources = [ |
| + "srtp/crypto/test/aes_calc.c", |
| + ] |
| + } |
| - executable("srtp_test_rand_gen") { |
| - configs -= [ "//build/config/compiler:chromium_code" ] |
| - configs += [ "//build/config/compiler:no_chromium_code" ] |
| - configs += [ ":libsrtp_config" ] |
| - deps = [ ":libsrtp" ] |
| - sources = [ |
| - "srtp/crypto/test/rand_gen.c", |
| - ] |
| - } |
| + executable("srtp_test_rand_gen") { |
| + configs -= [ "//build/config/compiler:chromium_code" ] |
| + configs += [ "//build/config/compiler:no_chromium_code" ] |
| + configs += [ ":libsrtp_config" ] |
| + deps = [ ":libsrtp" ] |
| + sources = [ |
| + "srtp/crypto/test/rand_gen.c", |
| + ] |
| + } |
| - executable("srtp_test_env") { |
| - configs -= [ "//build/config/compiler:chromium_code" ] |
| - configs += [ "//build/config/compiler:no_chromium_code" ] |
| - configs += [ ":libsrtp_config" ] |
| - deps = [ ":libsrtp" ] |
| - sources = [ |
| - "srtp/crypto/test/env.c", |
| - ] |
| - } |
| + executable("srtp_test_env") { |
| + configs -= [ "//build/config/compiler:chromium_code" ] |
| + configs += [ "//build/config/compiler:no_chromium_code" ] |
| + configs += [ ":libsrtp_config" ] |
| + 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_env", |
| - ] |
| + 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_env", |
| + ] |
| + } |
| } |
| } |