diff options
| author | Ben Murdoch <benm@google.com> | 2013-07-24 10:36:34 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2013-07-24 10:36:34 +0100 |
| commit | a3f7b4e666c476898878fa745f637129375cd889 (patch) | |
| tree | 1d78b48780e4c8603c226fd88d8f4b786f00bb81 /third_party/zlib/zlib.target.linux-x86.mk | |
| parent | d4336a7d5c149891bede0c3201c8e831520067af (diff) | |
| download | chromium_org-a3f7b4e666c476898878fa745f637129375cd889.tar.gz | |
Merge from Chromium at DEPS revision r213371
This commit was generated by merge_to_master.py.
Change-Id: I35a74205de4bff52a2dd6b15330f8a002a39efaf
Diffstat (limited to 'third_party/zlib/zlib.target.linux-x86.mk')
| -rw-r--r-- | third_party/zlib/zlib.target.linux-x86.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/third_party/zlib/zlib.target.linux-x86.mk b/third_party/zlib/zlib.target.linux-x86.mk index 4f1e788153..9fe9374957 100644 --- a/third_party/zlib/zlib.target.linux-x86.mk +++ b/third_party/zlib/zlib.target.linux-x86.mk @@ -87,10 +87,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -171,10 +171,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ |