Revert of Roll src/third_party/libsrtp 6446144:f0957e8 (svn 292694:295151)

build/secondary/third_party/libsrtp/BUILD.gn

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 e40c9a6176c2cb7a9ce93823ff1ba4efb934cc4a..8b9647c142e6df2462a544707ae617e94cfd9344 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 = [
@@ -20,10 +17,6 @@
     "srtp/include",
     "srtp/crypto/include",
   ]
-
-  if (use_srtp_boringssl) {
-    defines += [ "OPENSSL" ]
-  }
 
   if (is_posix) {
     defines += [
@@ -37,14 +30,13 @@
       "HAVE_STDINT_H",
       "HAVE_INTTYPES_H",
       "HAVE_NETINET_IN_H",
-      "HAVE_ARPA_INET_H",
-      "HAVE_UNISTD_H",
-    ]
-    cflags = [ "-Wno-unused-variable" ]
+      "INLINE=inline",
+    ]
   }
 
   if (is_win) {
     defines += [
+      "INLINE=__inline",
       "HAVE_BYTESWAP_METHODS_H",
 
       # All Windows architectures are this way.
@@ -157,27 +149,6 @@
     if (is_clang) {
       cflags = [ "-Wno-implicit-function-declaration" ]
     }
-
-    if (use_srtp_boringssl) {
-      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
@@ -189,9 +160,6 @@
       deps = [
         ":libsrtp",
       ]
-      if (use_srtp_boringssl) {
-        deps += [ "//third_party/boringssl:boringssl" ]
-      }
       sources = [
         "srtp/include/getopt_s.h",
         "srtp/test/getopt_s.c",
@@ -205,9 +173,6 @@
       deps = [
         ":libsrtp",
       ]
-      if (use_srtp_boringssl) {
-        deps += [ "//third_party/boringssl:boringssl" ]
-      }
       sources = [
         "srtp/include/getopt_s.h",
         "srtp/include/srtp_priv.h",
@@ -222,9 +187,6 @@
       deps = [
         ":libsrtp",
       ]
-      if (use_srtp_boringssl) {
-        deps += [ "//third_party/boringssl:boringssl" ]
-      }
       sources = [
         "srtp/crypto/include/rdbx.h",
         "srtp/include/ut_sim.h",
@@ -238,9 +200,6 @@
       deps = [
         ":libsrtp",
       ]
-      if (use_srtp_boringssl) {
-        deps += [ "//third_party/boringssl:boringssl" ]
-      }
       sources = [
         "srtp/crypto/include/rdbx.h",
         "srtp/include/ut_sim.h",
@@ -254,9 +213,6 @@
       deps = [
         ":libsrtp",
       ]
-      if (use_srtp_boringssl) {
-        deps += [ "//third_party/boringssl:boringssl" ]
-      }
       sources = [
         "srtp/crypto/include/datatypes.h",
         "srtp/include/getopt_s.h",
@@ -280,13 +236,8 @@
       deps = [
         ":libsrtp",
       ]
-      if (use_srtp_boringssl) {
-        deps += [ "//third_party/boringssl:boringssl" ]
-      }
       sources = [
         "srtp/crypto/test/cipher_driver.c",
-        "srtp/include/getopt_s.h",
-        "srtp/test/getopt_s.c",
       ]
     }
 
@@ -296,9 +247,6 @@
       deps = [
         ":libsrtp",
       ]
-      if (use_srtp_boringssl) {
-        deps += [ "//third_party/boringssl:boringssl" ]
-      }
       sources = [
         "srtp/crypto/test/datatypes_driver.c",
       ]
@@ -310,9 +258,6 @@
       deps = [
         ":libsrtp",
       ]
-      if (use_srtp_boringssl) {
-        deps += [ "//third_party/boringssl:boringssl" ]
-      }
       sources = [
         "srtp/crypto/test/stat_driver.c",
       ]
@@ -324,9 +269,6 @@
       deps = [
         ":libsrtp",
       ]
-      if (use_srtp_boringssl) {
-        deps += [ "//third_party/boringssl:boringssl" ]
-      }
       sources = [
         "srtp/crypto/test/sha1_driver.c",
       ]
@@ -338,13 +280,8 @@
       deps = [
         ":libsrtp",
       ]
-      if (use_srtp_boringssl) {
-        deps += [ "//third_party/boringssl:boringssl" ]
-      }
       sources = [
         "srtp/crypto/test/kernel_driver.c",
-        "srtp/include/getopt_s.h",
-        "srtp/test/getopt_s.c",
       ]
     }
 
@@ -354,9 +291,6 @@
       deps = [
         ":libsrtp",
       ]
-      if (use_srtp_boringssl) {
-        deps += [ "//third_party/boringssl:boringssl" ]
-      }
       sources = [
         "srtp/crypto/test/aes_calc.c",
       ]
@@ -368,29 +302,8 @@
       deps = [
         ":libsrtp",
       ]
-      if (use_srtp_boringssl) {
-        deps += [ "//third_party/boringssl:boringssl" ]
-      }
       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",
-      ]
-      if (use_srtp_boringssl) {
-        deps += [ "//third_party/boringssl:boringssl" ]
-      }
-      sources = [
-        "srtp/crypto/test/rand_gen_soak.c",
-        "srtp/include/getopt_s.h",
-        "srtp/test/getopt_s.c",
       ]
     }
 
@@ -400,9 +313,6 @@
       deps = [
         ":libsrtp",
       ]
-      if (use_srtp_boringssl) {
-        deps += [ "//third_party/boringssl:boringssl" ]
-      }
       sources = [
         "srtp/crypto/test/env.c",
       ]
@@ -422,7 +332,6 @@
         ":srtp_test_kernel_driver",
         ":srtp_test_aes_calc",
         ":srtp_test_rand_gen",
-        ":srtp_test_rand_gen_soak",
         ":srtp_test_env",
       ]
     }