Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(718)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: libsrtp.gyp

Issue 1662363002: Remove use_system_libsrtp build knob. (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libsrtp.git@master
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« BUILD.gn ('K') | « BUILD.gn ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: libsrtp.gyp
diff --git a/libsrtp.gyp b/libsrtp.gyp
index a26e5114378bd851539cdc61a50fb6e145bffbc6..d84acdc8fa382d76db452dd204aaa9d7b20abd27 100644
--- a/libsrtp.gyp
+++ b/libsrtp.gyp
@@ -4,7 +4,6 @@
{
'variables': {
- 'use_system_libsrtp%': 0,
'use_openssl%': 1,
},
'target_defaults': {
@@ -116,321 +115,297 @@
],
},
},
- 'conditions': [
- ['use_system_libsrtp==0', {
- 'targets': [
- {
- 'target_name': 'libsrtp',
- 'type': 'static_library',
- 'sources': [
- # includes
- 'srtp/include/ekt.h',
- 'srtp/include/getopt_s.h',
- 'srtp/include/rtp.h',
- 'srtp/include/rtp_priv.h',
- 'srtp/include/srtp.h',
- 'srtp/include/srtp_priv.h',
- 'srtp/include/ut_sim.h',
+ 'targets': [
davidben 2016/02/04 19:37:11 Ditto about unindenting
+ {
+ 'target_name': 'libsrtp',
+ 'type': 'static_library',
+ 'sources': [
+ # includes
+ 'srtp/include/ekt.h',
+ 'srtp/include/getopt_s.h',
+ 'srtp/include/rtp.h',
+ 'srtp/include/rtp_priv.h',
+ 'srtp/include/srtp.h',
+ 'srtp/include/srtp_priv.h',
+ 'srtp/include/ut_sim.h',
- # headers
- 'srtp/crypto/include/aes_cbc.h',
- 'srtp/crypto/include/aes.h',
- 'srtp/crypto/include/aes_icm.h',
- 'srtp/crypto/include/alloc.h',
- 'srtp/crypto/include/auth.h',
- 'srtp/crypto/include/cipher.h',
- 'srtp/crypto/include/cryptoalg.h',
- 'srtp/crypto/include/crypto.h',
- 'srtp/crypto/include/crypto_kernel.h',
- 'srtp/crypto/include/crypto_math.h',
- 'srtp/crypto/include/crypto_types.h',
- 'srtp/crypto/include/datatypes.h',
- 'srtp/crypto/include/err.h',
- 'srtp/crypto/include/gf2_8.h',
- 'srtp/crypto/include/hmac.h',
- 'srtp/crypto/include/integers.h',
- 'srtp/crypto/include/kernel_compat.h',
- 'srtp/crypto/include/key.h',
- 'srtp/crypto/include/null_auth.h',
- 'srtp/crypto/include/null_cipher.h',
- 'srtp/crypto/include/prng.h',
- 'srtp/crypto/include/rand_source.h',
- 'srtp/crypto/include/rdb.h',
- 'srtp/crypto/include/rdbx.h',
- 'srtp/crypto/include/sha1.h',
- 'srtp/crypto/include/stat.h',
- 'srtp/crypto/include/xfm.h',
+ # headers
+ 'srtp/crypto/include/aes_cbc.h',
+ 'srtp/crypto/include/aes.h',
+ 'srtp/crypto/include/aes_icm.h',
+ 'srtp/crypto/include/alloc.h',
+ 'srtp/crypto/include/auth.h',
+ 'srtp/crypto/include/cipher.h',
+ 'srtp/crypto/include/cryptoalg.h',
+ 'srtp/crypto/include/crypto.h',
+ 'srtp/crypto/include/crypto_kernel.h',
+ 'srtp/crypto/include/crypto_math.h',
+ 'srtp/crypto/include/crypto_types.h',
+ 'srtp/crypto/include/datatypes.h',
+ 'srtp/crypto/include/err.h',
+ 'srtp/crypto/include/gf2_8.h',
+ 'srtp/crypto/include/hmac.h',
+ 'srtp/crypto/include/integers.h',
+ 'srtp/crypto/include/kernel_compat.h',
+ 'srtp/crypto/include/key.h',
+ 'srtp/crypto/include/null_auth.h',
+ 'srtp/crypto/include/null_cipher.h',
+ 'srtp/crypto/include/prng.h',
+ 'srtp/crypto/include/rand_source.h',
+ 'srtp/crypto/include/rdb.h',
+ 'srtp/crypto/include/rdbx.h',
+ 'srtp/crypto/include/sha1.h',
+ 'srtp/crypto/include/stat.h',
+ 'srtp/crypto/include/xfm.h',
- # sources
- 'srtp/srtp/ekt.c',
- 'srtp/srtp/srtp.c',
+ # sources
+ 'srtp/srtp/ekt.c',
+ 'srtp/srtp/srtp.c',
- 'srtp/crypto/cipher/aes.c',
+ 'srtp/crypto/cipher/aes.c',
+ 'srtp/crypto/cipher/aes_cbc.c',
+ 'srtp/crypto/cipher/aes_icm.c',
+ 'srtp/crypto/cipher/cipher.c',
+ 'srtp/crypto/cipher/null_cipher.c',
+ 'srtp/crypto/hash/auth.c',
+ 'srtp/crypto/hash/hmac.c',
+ 'srtp/crypto/hash/null_auth.c',
+ 'srtp/crypto/hash/sha1.c',
+ 'srtp/crypto/kernel/alloc.c',
+ 'srtp/crypto/kernel/crypto_kernel.c',
+ 'srtp/crypto/kernel/err.c',
+ 'srtp/crypto/kernel/key.c',
+ 'srtp/crypto/math/datatypes.c',
+ 'srtp/crypto/math/gf2_8.c',
+ 'srtp/crypto/math/stat.c',
+ 'srtp/crypto/replay/rdb.c',
+ 'srtp/crypto/replay/rdbx.c',
+ 'srtp/crypto/replay/ut_sim.c',
+ 'srtp/crypto/rng/ctr_prng.c',
+ 'srtp/crypto/rng/prng.c',
+ 'srtp/crypto/rng/rand_source.c',
+ ],
+ 'conditions': [
+ ['use_openssl==1', {
+ 'dependencies': [
+ '<(DEPTH)/third_party/boringssl/boringssl.gyp:boringssl',
+ ],
+ 'sources!': [
'srtp/crypto/cipher/aes_cbc.c',
'srtp/crypto/cipher/aes_icm.c',
- 'srtp/crypto/cipher/cipher.c',
- 'srtp/crypto/cipher/null_cipher.c',
- 'srtp/crypto/hash/auth.c',
'srtp/crypto/hash/hmac.c',
- 'srtp/crypto/hash/null_auth.c',
'srtp/crypto/hash/sha1.c',
- 'srtp/crypto/kernel/alloc.c',
- 'srtp/crypto/kernel/crypto_kernel.c',
- 'srtp/crypto/kernel/err.c',
- 'srtp/crypto/kernel/key.c',
- 'srtp/crypto/math/datatypes.c',
- 'srtp/crypto/math/gf2_8.c',
- 'srtp/crypto/math/stat.c',
- 'srtp/crypto/replay/rdb.c',
- 'srtp/crypto/replay/rdbx.c',
- 'srtp/crypto/replay/ut_sim.c',
'srtp/crypto/rng/ctr_prng.c',
'srtp/crypto/rng/prng.c',
'srtp/crypto/rng/rand_source.c',
],
- 'conditions': [
- ['use_openssl==1', {
- 'dependencies': [
- '<(DEPTH)/third_party/boringssl/boringssl.gyp: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',
- 'srtp/crypto/rng/rand_source.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',
- 'srtp/crypto/rng/rand_source_ossl.c',
- ],
- }],
- ],
- }, # target libsrtp
- {
- 'target_name': 'rdbx_driver',
- 'type': 'executable',
- 'dependencies': [
- 'libsrtp',
- ],
- 'sources': [
- 'srtp/include/getopt_s.h',
- 'srtp/test/getopt_s.c',
- 'srtp/test/rdbx_driver.c',
- ],
- },
- {
- 'target_name': 'srtp_driver',
- 'type': 'executable',
- 'dependencies': [
- 'libsrtp',
- ],
- 'sources': [
- 'srtp/include/getopt_s.h',
- 'srtp/include/srtp_priv.h',
- 'srtp/test/getopt_s.c',
- 'srtp/test/srtp_driver.c',
- ],
- },
- {
- 'target_name': 'roc_driver',
- 'type': 'executable',
- 'dependencies': [
- 'libsrtp',
- ],
- 'sources': [
- 'srtp/crypto/include/rdbx.h',
- 'srtp/include/ut_sim.h',
- 'srtp/test/roc_driver.c',
- ],
- },
- {
- 'target_name': 'replay_driver',
- 'type': 'executable',
- 'dependencies': [
- 'libsrtp',
- ],
- 'sources': [
- 'srtp/crypto/include/rdbx.h',
- 'srtp/include/ut_sim.h',
- 'srtp/test/replay_driver.c',
- ],
- },
- {
- 'target_name': 'rtpw',
- 'type': 'executable',
- 'dependencies': [
- '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',
- ],
- 'conditions': [
- ['OS=="android"', {
- 'defines': [
- 'HAVE_SYS_SOCKET_H',
- ],
- }],
- ],
- },
- {
- 'target_name': 'srtp_test_cipher_driver',
- 'type': 'executable',
- 'dependencies': [
- 'libsrtp',
- ],
- 'sources': [
- 'srtp/crypto/test/cipher_driver.c',
- 'srtp/include/getopt_s.h',
- 'srtp/test/getopt_s.c',
- ],
- 'conditions': [
- ['use_openssl==1', {
- 'dependencies': [
- '<(DEPTH)/third_party/boringssl/boringssl.gyp:boringssl',
- ],
- }],
- ],
- },
- {
- 'target_name': 'srtp_test_datatypes_driver',
- 'type': 'executable',
- 'dependencies': [
- 'libsrtp',
- ],
- 'sources': [
- 'srtp/crypto/test/datatypes_driver.c',
- ],
- },
- {
- 'target_name': 'srtp_test_stat_driver',
- 'type': 'executable',
- 'dependencies': [
- 'libsrtp',
- ],
- 'sources': [
- 'srtp/crypto/test/stat_driver.c',
- ],
- },
- {
- 'target_name': 'srtp_test_sha1_driver',
- 'type': 'executable',
- 'dependencies': [
- 'libsrtp',
- ],
- 'sources': [
- 'srtp/crypto/test/sha1_driver.c',
- ],
- },
- {
- 'target_name': 'srtp_test_kernel_driver',
- 'type': 'executable',
- 'dependencies': [
- 'libsrtp',
- ],
- 'sources': [
- 'srtp/crypto/test/kernel_driver.c',
- 'srtp/include/getopt_s.h',
- 'srtp/test/getopt_s.c',
- ],
- },
- {
- 'target_name': 'srtp_test_aes_calc',
- 'type': 'executable',
- 'dependencies': [
- 'libsrtp',
- ],
- 'sources': [
- 'srtp/crypto/test/aes_calc.c',
- ],
- },
- {
- 'target_name': 'srtp_test_rand_gen',
- 'type': 'executable',
- 'dependencies': [
- 'libsrtp',
- ],
- 'sources': [
- 'srtp/crypto/test/rand_gen.c',
- 'srtp/include/getopt_s.h',
- 'srtp/test/getopt_s.c',
- ],
- },
- {
- 'target_name': 'srtp_test_rand_gen_soak',
- 'type': 'executable',
- 'dependencies': [
- 'libsrtp',
- ],
'sources': [
- 'srtp/crypto/test/rand_gen_soak.c',
- 'srtp/include/getopt_s.h',
- 'srtp/test/getopt_s.c',
- ],
- },
- {
- 'target_name': 'srtp_test_env',
- 'type': 'executable',
- 'dependencies': [
- 'libsrtp',
+ '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',
+ 'srtp/crypto/rng/rand_source_ossl.c',
],
- 'sources': [
- 'srtp/crypto/test/env.c',
+ }],
+ ],
+ }, # target libsrtp
+ {
+ 'target_name': 'rdbx_driver',
+ 'type': 'executable',
+ 'dependencies': [
+ 'libsrtp',
+ ],
+ 'sources': [
+ 'srtp/include/getopt_s.h',
+ 'srtp/test/getopt_s.c',
+ 'srtp/test/rdbx_driver.c',
+ ],
+ },
+ {
+ 'target_name': 'srtp_driver',
+ 'type': 'executable',
+ 'dependencies': [
+ 'libsrtp',
+ ],
+ 'sources': [
+ 'srtp/include/getopt_s.h',
+ 'srtp/include/srtp_priv.h',
+ 'srtp/test/getopt_s.c',
+ 'srtp/test/srtp_driver.c',
+ ],
+ },
+ {
+ 'target_name': 'roc_driver',
+ 'type': 'executable',
+ 'dependencies': [
+ 'libsrtp',
+ ],
+ 'sources': [
+ 'srtp/crypto/include/rdbx.h',
+ 'srtp/include/ut_sim.h',
+ 'srtp/test/roc_driver.c',
+ ],
+ },
+ {
+ 'target_name': 'replay_driver',
+ 'type': 'executable',
+ 'dependencies': [
+ 'libsrtp',
+ ],
+ 'sources': [
+ 'srtp/crypto/include/rdbx.h',
+ 'srtp/include/ut_sim.h',
+ 'srtp/test/replay_driver.c',
+ ],
+ },
+ {
+ 'target_name': 'rtpw',
+ 'type': 'executable',
+ 'dependencies': [
+ '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',
+ ],
+ 'conditions': [
+ ['OS=="android"', {
+ 'defines': [
+ 'HAVE_SYS_SOCKET_H',
],
- },
- {
- 'target_name': 'srtp_runtest',
- 'type': 'none',
+ }],
+ ],
+ },
+ {
+ 'target_name': 'srtp_test_cipher_driver',
+ 'type': 'executable',
+ 'dependencies': [
+ 'libsrtp',
+ ],
+ 'sources': [
+ 'srtp/crypto/test/cipher_driver.c',
+ 'srtp/include/getopt_s.h',
+ 'srtp/test/getopt_s.c',
+ ],
+ 'conditions': [
+ ['use_openssl==1', {
'dependencies': [
- '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',
+ '<(DEPTH)/third_party/boringssl/boringssl.gyp:boringssl',
],
- },
- ], # targets
- }, { # use_system_libsrtp==1
- 'targets': [
- {
- 'target_name': 'libsrtp',
- 'type': 'none',
- 'direct_dependent_settings': {
- 'defines': [
- 'USE_SYSTEM_LIBSRTP',
- ],
- 'include_dirs': [
- '/usr/include/srtp',
- ],
- },
- 'link_settings': {
- 'libraries': [
- '-lsrtp',
- ],
- },
- }, # target libsrtp
- ], # targets
- }],
- ],
+ }],
+ ],
+ },
+ {
+ 'target_name': 'srtp_test_datatypes_driver',
+ 'type': 'executable',
+ 'dependencies': [
+ 'libsrtp',
+ ],
+ 'sources': [
+ 'srtp/crypto/test/datatypes_driver.c',
+ ],
+ },
+ {
+ 'target_name': 'srtp_test_stat_driver',
+ 'type': 'executable',
+ 'dependencies': [
+ 'libsrtp',
+ ],
+ 'sources': [
+ 'srtp/crypto/test/stat_driver.c',
+ ],
+ },
+ {
+ 'target_name': 'srtp_test_sha1_driver',
+ 'type': 'executable',
+ 'dependencies': [
+ 'libsrtp',
+ ],
+ 'sources': [
+ 'srtp/crypto/test/sha1_driver.c',
+ ],
+ },
+ {
+ 'target_name': 'srtp_test_kernel_driver',
+ 'type': 'executable',
+ 'dependencies': [
+ 'libsrtp',
+ ],
+ 'sources': [
+ 'srtp/crypto/test/kernel_driver.c',
+ 'srtp/include/getopt_s.h',
+ 'srtp/test/getopt_s.c',
+ ],
+ },
+ {
+ 'target_name': 'srtp_test_aes_calc',
+ 'type': 'executable',
+ 'dependencies': [
+ 'libsrtp',
+ ],
+ 'sources': [
+ 'srtp/crypto/test/aes_calc.c',
+ ],
+ },
+ {
+ 'target_name': 'srtp_test_rand_gen',
+ 'type': 'executable',
+ 'dependencies': [
+ 'libsrtp',
+ ],
+ 'sources': [
+ 'srtp/crypto/test/rand_gen.c',
+ 'srtp/include/getopt_s.h',
+ 'srtp/test/getopt_s.c',
+ ],
+ },
+ {
+ 'target_name': 'srtp_test_rand_gen_soak',
+ 'type': 'executable',
+ 'dependencies': [
+ 'libsrtp',
+ ],
+ 'sources': [
+ 'srtp/crypto/test/rand_gen_soak.c',
+ 'srtp/include/getopt_s.h',
+ 'srtp/test/getopt_s.c',
+ ],
+ },
+ {
+ 'target_name': 'srtp_test_env',
+ 'type': 'executable',
+ 'dependencies': [
+ 'libsrtp',
+ ],
+ 'sources': [
+ 'srtp/crypto/test/env.c',
+ ],
+ },
+ {
+ 'target_name': 'srtp_runtest',
+ 'type': 'none',
+ 'dependencies': [
+ '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',
+ ],
+ },
+ ], # targets
}
« BUILD.gn ('K') | « BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698