diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-09-22 23:50:09 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-09-22 23:50:09 +0000 |
| commit | bccfa77a190526eb7ea9a1d30368497c9bb0de61 (patch) | |
| tree | 07d3fa993ae744287f2f5f96973a29776e165040 | |
| parent | 3e9547436ab1e186253a554e2351a00e5007c303 (diff) | |
| download | libsrtp-bccfa77a190526eb7ea9a1d30368497c9bb0de61.tar.gz | |
Update makefiles after merge of Chromium at 7b0ec7dd4a37
This commit was generated by merge_from_chromium.py.
Change-Id: I384e21b0491c179f6108839381a480808e03e3a1
| -rw-r--r-- | libsrtp.target.darwin-arm.mk | 2 | ||||
| -rw-r--r-- | libsrtp.target.darwin-mips.mk | 2 | ||||
| -rw-r--r-- | libsrtp.target.darwin-x86.mk | 2 | ||||
| -rw-r--r-- | libsrtp.target.linux-arm.mk | 2 | ||||
| -rw-r--r-- | libsrtp.target.linux-mips.mk | 2 | ||||
| -rw-r--r-- | libsrtp.target.linux-x86.mk | 2 |
6 files changed, 12 insertions, 0 deletions
diff --git a/libsrtp.target.darwin-arm.mk b/libsrtp.target.darwin-arm.mk index 7eb0816..5ce6a65 100644 --- a/libsrtp.target.darwin-arm.mk +++ b/libsrtp.target.darwin-arm.mk @@ -111,6 +111,7 @@ MY_DEFS_Debug := \ '-DHAVE_NETINET_IN_H' \ '-DINLINE=inline' \ '-DCPU_CISC' \ + '-DFORCE_64BIT_ALIGN' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ @@ -232,6 +233,7 @@ MY_DEFS_Release := \ '-DHAVE_NETINET_IN_H' \ '-DINLINE=inline' \ '-DCPU_CISC' \ + '-DFORCE_64BIT_ALIGN' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ diff --git a/libsrtp.target.darwin-mips.mk b/libsrtp.target.darwin-mips.mk index c0a070c..4aad9c9 100644 --- a/libsrtp.target.darwin-mips.mk +++ b/libsrtp.target.darwin-mips.mk @@ -104,6 +104,7 @@ MY_DEFS_Debug := \ '-DHAVE_NETINET_IN_H' \ '-DINLINE=inline' \ '-DCPU_RISC' \ + '-DFORCE_64BIT_ALIGN' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ @@ -218,6 +219,7 @@ MY_DEFS_Release := \ '-DHAVE_NETINET_IN_H' \ '-DINLINE=inline' \ '-DCPU_RISC' \ + '-DFORCE_64BIT_ALIGN' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ diff --git a/libsrtp.target.darwin-x86.mk b/libsrtp.target.darwin-x86.mk index aff6651..3076c7e 100644 --- a/libsrtp.target.darwin-x86.mk +++ b/libsrtp.target.darwin-x86.mk @@ -106,6 +106,7 @@ MY_DEFS_Debug := \ '-DHAVE_NETINET_IN_H' \ '-DINLINE=inline' \ '-DCPU_CISC' \ + '-DFORCE_64BIT_ALIGN' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ @@ -221,6 +222,7 @@ MY_DEFS_Release := \ '-DHAVE_NETINET_IN_H' \ '-DINLINE=inline' \ '-DCPU_CISC' \ + '-DFORCE_64BIT_ALIGN' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ diff --git a/libsrtp.target.linux-arm.mk b/libsrtp.target.linux-arm.mk index 7eb0816..5ce6a65 100644 --- a/libsrtp.target.linux-arm.mk +++ b/libsrtp.target.linux-arm.mk @@ -111,6 +111,7 @@ MY_DEFS_Debug := \ '-DHAVE_NETINET_IN_H' \ '-DINLINE=inline' \ '-DCPU_CISC' \ + '-DFORCE_64BIT_ALIGN' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ @@ -232,6 +233,7 @@ MY_DEFS_Release := \ '-DHAVE_NETINET_IN_H' \ '-DINLINE=inline' \ '-DCPU_CISC' \ + '-DFORCE_64BIT_ALIGN' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ diff --git a/libsrtp.target.linux-mips.mk b/libsrtp.target.linux-mips.mk index c0a070c..4aad9c9 100644 --- a/libsrtp.target.linux-mips.mk +++ b/libsrtp.target.linux-mips.mk @@ -104,6 +104,7 @@ MY_DEFS_Debug := \ '-DHAVE_NETINET_IN_H' \ '-DINLINE=inline' \ '-DCPU_RISC' \ + '-DFORCE_64BIT_ALIGN' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ @@ -218,6 +219,7 @@ MY_DEFS_Release := \ '-DHAVE_NETINET_IN_H' \ '-DINLINE=inline' \ '-DCPU_RISC' \ + '-DFORCE_64BIT_ALIGN' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ diff --git a/libsrtp.target.linux-x86.mk b/libsrtp.target.linux-x86.mk index aff6651..3076c7e 100644 --- a/libsrtp.target.linux-x86.mk +++ b/libsrtp.target.linux-x86.mk @@ -106,6 +106,7 @@ MY_DEFS_Debug := \ '-DHAVE_NETINET_IN_H' \ '-DINLINE=inline' \ '-DCPU_CISC' \ + '-DFORCE_64BIT_ALIGN' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ @@ -221,6 +222,7 @@ MY_DEFS_Release := \ '-DHAVE_NETINET_IN_H' \ '-DINLINE=inline' \ '-DCPU_CISC' \ + '-DFORCE_64BIT_ALIGN' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ |