diff --git a/DEPS b/DEPS index f3dcd9a6e6baf3..e7e8fe6c809a9c 100644 --- a/DEPS +++ b/DEPS @@ -210,7 +210,7 @@ deps = { Var('chromium_git') + '/external/usrsctplib.git' + '@' + '36444a999739e9e408f8f587cb4c3ffeef2e50ac', # from svn revision 9215 'src/third_party/libsrtp': - Var('chromium_git') + '/chromium/deps/libsrtp.git' + '@' + '9c53f858cddd4d890e405e91ff3af0b48dfd90e6', # from svn revision 295151 + Var('chromium_git') + '/chromium/deps/libsrtp.git' + '@' + '6446144c7f083552f21cc4e6768e891bcb767574', 'src/third_party/yasm/source/patched-yasm': Var('chromium_git') + '/chromium/deps/yasm/patched-yasm.git' + '@' + '4671120cd8558ce62ee8672ebf3eb6f5216f909b', diff --git a/build/secondary/third_party/libsrtp/BUILD.gn b/build/secondary/third_party/libsrtp/BUILD.gn index 7601bea0d64c26..8b9647c142e6df 100644 --- a/build/secondary/third_party/libsrtp/BUILD.gn +++ b/build/secondary/third_party/libsrtp/BUILD.gn @@ -4,15 +4,12 @@ declare_args() { use_system_libsrtp = false - use_srtp_boringssl = true } config("libsrtp_config") { defines = [ - "HAVE_CONFIG_H", "HAVE_STDLIB_H", "HAVE_STRING_H", - "TESTAPP_SOURCE", ] include_dirs = [ @@ -21,10 +18,6 @@ config("libsrtp_config") { "srtp/crypto/include", ] - if (use_srtp_boringssl) { - defines += [ "OPENSSL" ] - } - if (is_posix) { defines += [ "HAVE_INT16_T", @@ -37,14 +30,13 @@ config("libsrtp_config") { "HAVE_STDINT_H", "HAVE_INTTYPES_H", "HAVE_NETINET_IN_H", - "HAVE_ARPA_INET_H", - "HAVE_UNISTD_H", + "INLINE=inline", ] - cflags = [ "-Wno-unused-variable" ] } if (is_win) { defines += [ + "INLINE=__inline", "HAVE_BYTESWAP_METHODS_H", # All Windows architectures are this way. @@ -157,30 +149,6 @@ if (use_system_libsrtp) { if (is_clang) { cflags = [ "-Wno-implicit-function-declaration" ] } - - if (use_srtp_boringssl) { - deps = [ - "//third_party/boringssl:boringssl", - ] - public_deps = [ - "//third_party/boringssl:boringssl", - ] - sources -= [ - "srtp/crypto/cipher/aes_cbc.c", - "srtp/crypto/cipher/aes_icm.c", - "srtp/crypto/hash/hmac.c", - "srtp/crypto/hash/sha1.c", - "srtp/crypto/rng/ctr_prng.c", - "srtp/crypto/rng/prng.c", - ] - sources += [ - "srtp/crypto/cipher/aes_gcm_ossl.c", - "srtp/crypto/cipher/aes_icm_ossl.c", - "srtp/crypto/hash/hmac_ossl.c", - "srtp/crypto/include/aes_gcm_ossl.h", - "srtp/crypto/include/aes_icm_ossl.h", - ] - } } # TODO(GYP): A bunch of these tests don't compile (in gyp either). They're @@ -270,8 +238,6 @@ if (use_system_libsrtp) { ] sources = [ "srtp/crypto/test/cipher_driver.c", - "srtp/include/getopt_s.h", - "srtp/test/getopt_s.c", ] } @@ -316,8 +282,6 @@ if (use_system_libsrtp) { ] sources = [ "srtp/crypto/test/kernel_driver.c", - "srtp/include/getopt_s.h", - "srtp/test/getopt_s.c", ] } @@ -340,21 +304,6 @@ if (use_system_libsrtp) { ] sources = [ "srtp/crypto/test/rand_gen.c", - "srtp/include/getopt_s.h", - "srtp/test/getopt_s.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", ] } @@ -383,7 +332,6 @@ if (use_system_libsrtp) { ":srtp_test_kernel_driver", ":srtp_test_aes_calc", ":srtp_test_rand_gen", - ":srtp_test_rand_gen_soak", ":srtp_test_env", ] }