diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-10-31 11:16:26 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-10-31 11:16:26 +0000 |
| commit | 1e9bf3e0803691d0a228da41fc608347b6db4340 (patch) | |
| tree | ab2e5565f71b4219b3da406e19f16fe306704ef5 /media/player_android.target.linux-x86.mk | |
| parent | f10b58d5bc6ae3e74076fc4ccca14cbc57ef805c (diff) | |
| download | chromium_org-1e9bf3e0803691d0a228da41fc608347b6db4340.tar.gz | |
Merge from Chromium at DEPS revision 232015
This commit was generated by merge_to_master.py.
Change-Id: If86767ad396b9e2e1a4c1e9df1427daea29703ef
Diffstat (limited to 'media/player_android.target.linux-x86.mk')
| -rw-r--r-- | media/player_android.target.linux-x86.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/media/player_android.target.linux-x86.mk b/media/player_android.target.linux-x86.mk index e222846358..9a998810ff 100644 --- a/media/player_android.target.linux-x86.mk +++ b/media/player_android.target.linux-x86.mk @@ -78,13 +78,13 @@ MY_DEFS_Debug := \ '-DANGLE_DX11' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ - '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ - '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ + '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ @@ -171,13 +171,13 @@ MY_DEFS_Release := \ '-DANGLE_DX11' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ - '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ - '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ + '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ |