diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-06-25 15:10:09 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-06-25 15:10:09 +0000 |
| commit | d3cc9781130d9b6ff0b4ca88c55b54e418604f1d (patch) | |
| tree | 224d743a131f6161156769bdaa8a7cf73937094a /openssl.target.linux-x86_64.mk | |
| parent | 4f17781540e08047f7cee3b0af41639fa8c1e3dd (diff) | |
| download | openssl-d3cc9781130d9b6ff0b4ca88c55b54e418604f1d.tar.gz | |
Update makefiles after merge of Chromium at 279716
This commit was generated by merge_from_chromium.py.
Change-Id: I3ac0b901144d493a9efd5a02d75e6cf660cbf579
Diffstat (limited to 'openssl.target.linux-x86_64.mk')
| -rw-r--r-- | openssl.target.linux-x86_64.mk | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/openssl.target.linux-x86_64.mk b/openssl.target.linux-x86_64.mk index 95d3124..433f11f 100644 --- a/openssl.target.linux-x86_64.mk +++ b/openssl.target.linux-x86_64.mk @@ -643,6 +643,7 @@ MY_DEFS_Debug := \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ + '-DCLD_DATA_FROM_STATIC' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ @@ -700,6 +701,9 @@ LOCAL_CPPFLAGS_Debug := \ -fno-threadsafe-statics \ -fvisibility-inlines-hidden \ -Wno-deprecated \ + -std=gnu++11 \ + -Wno-narrowing \ + -Wno-literal-suffix \ -Wno-non-virtual-dtor \ -Wno-sign-promo \ -Wno-non-virtual-dtor @@ -760,6 +764,7 @@ MY_DEFS_Release := \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ + '-DCLD_DATA_FROM_STATIC' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ @@ -817,6 +822,9 @@ LOCAL_CPPFLAGS_Release := \ -fno-threadsafe-statics \ -fvisibility-inlines-hidden \ -Wno-deprecated \ + -std=gnu++11 \ + -Wno-narrowing \ + -Wno-literal-suffix \ -Wno-non-virtual-dtor \ -Wno-sign-promo \ -Wno-non-virtual-dtor |