diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2013-07-24 07:30:15 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2013-07-24 07:30:15 +0000 |
| commit | 91b2929a84dcdf6e601a990329b53c629f133306 (patch) | |
| tree | 9de26d405fd08c6d8e0fc4d7801f4b7435159025 | |
| parent | 93d42cc90c23e09d03260e2c19332f8e93107003 (diff) | |
| download | openssl-91b2929a84dcdf6e601a990329b53c629f133306.tar.gz | |
Update makefiles after merge of Chromium at r213363
This commit was generated by merge_from_chromium.py.
Change-Id: I67b596e4f58c07b0a6034300ebf46b1cd86ea902
| -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, 0 insertions, 12 deletions
diff --git a/openssl.target.darwin-arm.mk b/openssl.target.darwin-arm.mk index 16ce00f..35d98ac 100644 --- a/openssl.target.darwin-arm.mk +++ b/openssl.target.darwin-arm.mk @@ -628,7 +628,6 @@ MY_DEFS_Debug := \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DNO_WINDOWS_BRAINDEATH' \ '-DPURIFY' \ '-DMONOLITH' \ @@ -727,7 +726,6 @@ MY_DEFS_Release := \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DNO_WINDOWS_BRAINDEATH' \ '-DPURIFY' \ '-DMONOLITH' \ diff --git a/openssl.target.darwin-mips.mk b/openssl.target.darwin-mips.mk index bdd0ce5..c1a159d 100644 --- a/openssl.target.darwin-mips.mk +++ b/openssl.target.darwin-mips.mk @@ -625,7 +625,6 @@ MY_DEFS_Debug := \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DNO_WINDOWS_BRAINDEATH' \ '-DPURIFY' \ '-DMONOLITH' \ @@ -721,7 +720,6 @@ MY_DEFS_Release := \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DNO_WINDOWS_BRAINDEATH' \ '-DPURIFY' \ '-DMONOLITH' \ diff --git a/openssl.target.darwin-x86.mk b/openssl.target.darwin-x86.mk index 3215cf1..5296097 100644 --- a/openssl.target.darwin-x86.mk +++ b/openssl.target.darwin-x86.mk @@ -633,7 +633,6 @@ MY_DEFS_Debug := \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DNO_WINDOWS_BRAINDEATH' \ '-DPURIFY' \ '-DMONOLITH' \ @@ -741,7 +740,6 @@ MY_DEFS_Release := \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DNO_WINDOWS_BRAINDEATH' \ '-DPURIFY' \ '-DMONOLITH' \ diff --git a/openssl.target.linux-arm.mk b/openssl.target.linux-arm.mk index 16ce00f..35d98ac 100644 --- a/openssl.target.linux-arm.mk +++ b/openssl.target.linux-arm.mk @@ -628,7 +628,6 @@ MY_DEFS_Debug := \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DNO_WINDOWS_BRAINDEATH' \ '-DPURIFY' \ '-DMONOLITH' \ @@ -727,7 +726,6 @@ MY_DEFS_Release := \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DNO_WINDOWS_BRAINDEATH' \ '-DPURIFY' \ '-DMONOLITH' \ diff --git a/openssl.target.linux-mips.mk b/openssl.target.linux-mips.mk index bdd0ce5..c1a159d 100644 --- a/openssl.target.linux-mips.mk +++ b/openssl.target.linux-mips.mk @@ -625,7 +625,6 @@ MY_DEFS_Debug := \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DNO_WINDOWS_BRAINDEATH' \ '-DPURIFY' \ '-DMONOLITH' \ @@ -721,7 +720,6 @@ MY_DEFS_Release := \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DNO_WINDOWS_BRAINDEATH' \ '-DPURIFY' \ '-DMONOLITH' \ diff --git a/openssl.target.linux-x86.mk b/openssl.target.linux-x86.mk index 3215cf1..5296097 100644 --- a/openssl.target.linux-x86.mk +++ b/openssl.target.linux-x86.mk @@ -633,7 +633,6 @@ MY_DEFS_Debug := \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DNO_WINDOWS_BRAINDEATH' \ '-DPURIFY' \ '-DMONOLITH' \ @@ -741,7 +740,6 @@ MY_DEFS_Release := \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DNO_WINDOWS_BRAINDEATH' \ '-DPURIFY' \ '-DMONOLITH' \ |