Change macro definitions for android/arm and add srtp tests into gyp

third_party/libsrtp/libsrtp.gyp

Index: third_party/libsrtp/libsrtp.gyp
===================================================================
--- third_party/libsrtp/libsrtp.gyp	(revision 130067)
+++ third_party/libsrtp/libsrtp.gyp	(working copy)
@@ -30,7 +30,19 @@
       }],
       ['target_arch=="arm"', {
         'defines': [
-          'CPU_RISC',
+          # TODO(leozwang): CPU_RISC doesn't work properly on android/arm
+          # platform for unknown reasons, need to investigate the root cause
+          # of it. CPU_RISC is used for optimization only, and CPU_CISC should
+          # just work just fine, it has been tested on android/arm with srtp
+          # test applications and libjingle.
+          'CPU_CISC',
+          'HAVE_INT16_T',
+          'HAVE_INT32_T',
+          'HAVE_INT8_T',
+          'HAVE_UINT16_T',
+          'HAVE_UINT32_T',
+          'HAVE_UINT64_T',
+          'HAVE_UINT8_T',
           'SIZEOF_UNSIGNED_LONG=4',
           'SIZEOF_UNSIGNED_LONG_LONG=8',
         ],
@@ -72,7 +84,13 @@
         }],
         ['target_arch=="arm"', {
           'defines': [
-            'CPU_RISC',
+            'HAVE_INT16_T',
+            'HAVE_INT32_T',
+            'HAVE_INT8_T',
+            'HAVE_UINT16_T',
+            'HAVE_UINT32_T',
+            'HAVE_UINT64_T',
+            'HAVE_UINT8_T',
             'SIZEOF_UNSIGNED_LONG=4',
             'SIZEOF_UNSIGNED_LONG_LONG=8',
           ],
@@ -163,7 +181,203 @@
         'srtp/crypto/rng/prng.c',
         'srtp/crypto/rng/rand_source.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',
+      ],
+    },
+    {
+      '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',
+      ],
+    },
+    {
+      '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',
+      ],
+    },
+    {
+      '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_env',
+      ],
+      'actions': [{
+        'action_name': 'help',
+        'inputs': [''],
+        'outputs': [''],
+        'action': [
+          'python', '-c',
+          'print "Please run srtp tests on the target, for example, on linux"; \
+	         print "    rdbx_driver"; \
+	         print "    srtp_driver"; \
+	         print "    roc_driver"; \
+	         print "    replay_driver"; \
+	         print "    rtpw"; \
+	         print "    srtp_test_aes_calc \
+                      000102030405060708090a0b0c0d0e0f \
+                      00112233445566778899aabbccddeeff "; \
+           print "    (srtp_test_aes_calc output should be \
+                      69c4e0d86a7b0430d8cdb78070b4c55a)"; \
+	         print "    srtp_test_cipher_driver -v"; \
+	         print "    srtp_test_datatypes_driver -v"; \
+	         print "    srtp_test_stat_driver"; \
+	         print "    srtp_test_sha1_driver -v"; \
+	         print "    srtp_test_kernel_driver -v"; \
+	         print "    srtp_test_rand_gen -n 256"; \
+           print "";' ],
+      }],
+    },
   ], # targets
 }