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,14 @@
       }],
       ['target_arch=="arm"', {
         'defines': [
-          'CPU_RISC',
+          'CPU_CISC',

[leozwang, 2012/04/04 16:39:32]

CPU_CISC is used for arm now. CPU_RISC is the cause that makes srtp fail, it
also causes srtp test app fail. I can dig into it if its needed. I accidentally
found this link, 
https://trac.pjsip.org/repos/changeset/1746/pjproject/trunk/third_party/build....
which means CPU_RISC didn't work well before, seems its still broken now.

+          'HAVE_INT16_T',
+          'HAVE_INT32_T',
+          'HAVE_INT8_T',
+          'HAVE_UINT16_T',
+          'HAVE_UINT32_T',
+          'HAVE_UINT64_T',
+          'HAVE_UINT8_T',

[leozwang, 2012/04/04 16:39:32]

I have to add these defines to make it compile on android. (It might not be
necessary on other arm platforms.) If I don't have these defines, I will get,
for example, "uint16_t redefined" error. The reason why they're needed only for
android is because android has slight different libc implementation, these data
type are already defined by android, if application defines these data type
again, it will cause compilation error. The details, for example
in srtp integer.h        typedef unsigned short int uint16_t
On android:
in _type.h   typedef unsigned short int __uint16_t <- which is included by
stdint.h
in stdint.h  typedef __uint16_t uint16_t   <- which is included by stdlib.h

In order to remove compilation error, I added these 7 macro defines.

           'SIZEOF_UNSIGNED_LONG=4',
           'SIZEOF_UNSIGNED_LONG_LONG=8',
         ],
@@ -72,7 +79,14 @@
         }],
         ['target_arch=="arm"', {
           'defines': [
-            'CPU_RISC',
+            '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',
           ],
@@ -163,7 +177,257 @@
         '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': 'libcryptomodule',

[Mallinath (Gone from Chromium), 2012/04/04 16:45:46]

Why do you need one more target, compiling same files?

[leozwang, 2012/04/04 16:53:11]

One reason is its from original makefile, another reason is the list of source
file is slightly different.

[Mallinath (Gone from Chromium), 2012/04/05 16:37:14]

I would prefer having the single target. If there is change in the source, then
can you add those files to the main target. Otherwise we are testing two
different things.
On 2012/04/04 16:53:11, leozwang wrote:

+      'type': 'static_library',
+      'sources': [
+        # 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/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/stat.c',
+        'srtp/crypto/rng/ctr_prng.c',
+        'srtp/crypto/ae_xfm/xfm.c',
+        'srtp/crypto/rng/prng.c',
+        'srtp/crypto/rng/rand_source.c',
+      ],
+    }, # target libcryptomodule
+    {
+      'target_name': 'srtp_test_cipher_driver',
+      'type': 'executable',
+      'dependencies': [
+        'libcryptomodule',
+      ],
+      'sources': [
+        'srtp/crypto/test/cipher_driver.c',
+      ],
+    },
+    {
+      'target_name': 'srtp_test_datatypes_driver',
+      'type': 'executable',
+      'dependencies': [
+        'libcryptomodule',
+      ],
+      'sources': [
+        'srtp/crypto/test/datatypes_driver.c',
+      ],
+    },
+    {
+      'target_name': 'srtp_test_stat_driver',
+      'type': 'executable',
+      'dependencies': [
+        'libcryptomodule',
+      ],
+      'sources': [
+        'srtp/crypto/test/stat_driver.c',
+      ],
+    },
+    {
+      'target_name': 'srtp_test_sha1_driver',
+      'type': 'executable',
+      'dependencies': [
+        'libcryptomodule',
+      ],
+      'sources': [
+        'srtp/crypto/test/sha1_driver.c',
+      ],
+    },
+    {
+      'target_name': 'srtp_test_kernel_driver',
+      'type': 'executable',
+      'dependencies': [
+        'libcryptomodule',
+      ],
+      'sources': [
+        'srtp/crypto/test/kernel_driver.c',
+      ],
+    },
+    {
+      'target_name': 'srtp_test_aes_calc',
+      'type': 'executable',
+      'dependencies': [
+        'libcryptomodule',
+      ],
+      'sources': [
+        'srtp/crypto/test/aes_calc.c',
+      ],
+    },
+    {
+      'target_name': 'srtp_test_rand_gen',
+      'type': 'executable',
+      'dependencies': [
+        'libcryptomodule',
+      ],
+      'sources': [
+        'srtp/crypto/test/rand_gen.c',
+      ],
+    },
+    {
+      'target_name': 'srtp_test_env',
+      'type': 'executable',
+      'dependencies': [
+        'libcryptomodule',
+      ],
+      '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
 }