diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2013-09-14 22:58:34 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2013-09-14 22:58:34 +0000 |
| commit | cabb6c525ee3075e1d7e224089494c219369f58c (patch) | |
| tree | 9f98e063acf48be2dc35f63419c21893aa7d69c1 | |
| parent | 59228bb4a298019cc1c30490908a38b96c0e3bc3 (diff) | |
| download | openssl-cabb6c525ee3075e1d7e224089494c219369f58c.tar.gz | |
Update makefiles after merge of Chromium at 223266
This commit was generated by merge_from_chromium.py.
Change-Id: Iba615e864af90268dc48668005389a72296d5508
| -rw-r--r-- | openssl.target.darwin-arm.mk | 2 | ||||
| -rw-r--r-- | openssl.target.darwin-mips.mk | 2 | ||||
| -rw-r--r-- | openssl.target.darwin-x86.mk | 2 | ||||
| -rw-r--r-- | openssl.target.linux-arm.mk | 2 | ||||
| -rw-r--r-- | openssl.target.linux-mips.mk | 2 | ||||
| -rw-r--r-- | openssl.target.linux-x86.mk | 2 |
6 files changed, 12 insertions, 0 deletions
diff --git a/openssl.target.darwin-arm.mk b/openssl.target.darwin-arm.mk index c22af81..0633bd9 100644 --- a/openssl.target.darwin-arm.mk +++ b/openssl.target.darwin-arm.mk @@ -624,6 +624,7 @@ MY_DEFS_Debug := \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ + '-DUSE_XI2_MT=2' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ @@ -724,6 +725,7 @@ MY_DEFS_Release := \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ + '-DUSE_XI2_MT=2' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ diff --git a/openssl.target.darwin-mips.mk b/openssl.target.darwin-mips.mk index 2dbfbed..fba13bb 100644 --- a/openssl.target.darwin-mips.mk +++ b/openssl.target.darwin-mips.mk @@ -621,6 +621,7 @@ MY_DEFS_Debug := \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ + '-DUSE_XI2_MT=2' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ @@ -718,6 +719,7 @@ MY_DEFS_Release := \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ + '-DUSE_XI2_MT=2' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ diff --git a/openssl.target.darwin-x86.mk b/openssl.target.darwin-x86.mk index 695694c..4dbd5ad 100644 --- a/openssl.target.darwin-x86.mk +++ b/openssl.target.darwin-x86.mk @@ -629,6 +629,7 @@ MY_DEFS_Debug := \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ + '-DUSE_XI2_MT=2' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ @@ -738,6 +739,7 @@ MY_DEFS_Release := \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ + '-DUSE_XI2_MT=2' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ diff --git a/openssl.target.linux-arm.mk b/openssl.target.linux-arm.mk index c22af81..0633bd9 100644 --- a/openssl.target.linux-arm.mk +++ b/openssl.target.linux-arm.mk @@ -624,6 +624,7 @@ MY_DEFS_Debug := \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ + '-DUSE_XI2_MT=2' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ @@ -724,6 +725,7 @@ MY_DEFS_Release := \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ + '-DUSE_XI2_MT=2' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ diff --git a/openssl.target.linux-mips.mk b/openssl.target.linux-mips.mk index 2dbfbed..fba13bb 100644 --- a/openssl.target.linux-mips.mk +++ b/openssl.target.linux-mips.mk @@ -621,6 +621,7 @@ MY_DEFS_Debug := \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ + '-DUSE_XI2_MT=2' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ @@ -718,6 +719,7 @@ MY_DEFS_Release := \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ + '-DUSE_XI2_MT=2' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ diff --git a/openssl.target.linux-x86.mk b/openssl.target.linux-x86.mk index 695694c..4dbd5ad 100644 --- a/openssl.target.linux-x86.mk +++ b/openssl.target.linux-x86.mk @@ -629,6 +629,7 @@ MY_DEFS_Debug := \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ + '-DUSE_XI2_MT=2' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ @@ -738,6 +739,7 @@ MY_DEFS_Release := \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ + '-DUSE_XI2_MT=2' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ |