summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorprimiano@chromium.org <primiano@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c>2014-04-03 10:17:27 +0000
committerprimiano@chromium.org <primiano@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c>2014-04-03 10:17:27 +0000
commit2f2e557b809dc1dd7977098ad354a540f04beb4e (patch)
tree80c8033d934d8f3f2fce06650d71d63fd2f60321
parent7dff545eb37825dc4bc667aa1fa65cea5ea5a1ea (diff)
downloadlibsrtp-2f2e557b809dc1dd7977098ad354a540f04beb4e.tar.gz
Add support for arm64
Add arm64 target to GYP files. This is for getting a build of content shell for ARM64. BUG=354405 R=phajdan.jr@chromium.org Review URL: https://codereview.chromium.org/222553004 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libsrtp@261337 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
-rw-r--r--README.chromium2
-rw-r--r--libsrtp.gyp4
2 files changed, 4 insertions, 2 deletions
diff --git a/README.chromium b/README.chromium
index f1c9335..32b832e 100644
--- a/README.chromium
+++ b/README.chromium
@@ -20,3 +20,5 @@ This is required because VS2012 does not allow redefinition of keywords via
macros, but also does not support 'inline' in C files.
Adding additional RTP header check
+
+Added gyp support to __arm64__
diff --git a/libsrtp.gyp b/libsrtp.gyp
index 5385da8..a642d6e 100644
--- a/libsrtp.gyp
+++ b/libsrtp.gyp
@@ -46,7 +46,7 @@
'CPU_CISC',
],
}],
- ['target_arch=="arm" or target_arch=="armv7"', {
+ ['target_arch=="arm" or target_arch=="armv7" or target_arch=="arm64"', {
'defines': [
# TODO(leozwang): CPU_RISC doesn't work properly on android/arm
# platform for unknown reasons, need to investigate the root cause
@@ -154,7 +154,7 @@
# sources
'srtp/srtp/ekt.c',
'srtp/srtp/srtp.c',
-
+
'srtp/crypto/cipher/aes.c',
'srtp/crypto/cipher/aes_cbc.c',
'srtp/crypto/cipher/aes_icm.c',