diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-06-11 10:57:03 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-06-11 10:57:03 +0100 |
| commit | 868fa2fe829687343ffae624259930155e16dbd8 (patch) | |
| tree | 54d316199dd9739c57c3aacd131853bbd6554a94 /sdch | |
| parent | bb1bdbd796f966b5bf11f40ecbea12621c7bfac9 (diff) | |
| download | chromium_org-868fa2fe829687343ffae624259930155e16dbd8.tar.gz | |
Merge from Chromium at DEPS revision r205460
This commit was generated by merge_to_master.py.
Change-Id: I4a744a5e426bd3bb378d887cfa56fe054742a540
Diffstat (limited to 'sdch')
| -rw-r--r-- | sdch/sdch.target.darwin-arm.mk | 1 | ||||
| -rw-r--r-- | sdch/sdch.target.darwin-x86.mk | 1 | ||||
| -rw-r--r-- | sdch/sdch.target.linux-arm.mk | 1 | ||||
| -rw-r--r-- | sdch/sdch.target.linux-x86.mk | 1 |
4 files changed, 0 insertions, 4 deletions
diff --git a/sdch/sdch.target.darwin-arm.mk b/sdch/sdch.target.darwin-arm.mk index 047eb42c67..0e0c537229 100644 --- a/sdch/sdch.target.darwin-arm.mk +++ b/sdch/sdch.target.darwin-arm.mk @@ -77,7 +77,6 @@ MY_DEFS := \ '-DNO_TCMALLOC' \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ - '-DENABLE_DOUBLE_RESOURCE_LOAD_TIMING' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_GPU=1' \ diff --git a/sdch/sdch.target.darwin-x86.mk b/sdch/sdch.target.darwin-x86.mk index abeb8b0d53..e81cad5f43 100644 --- a/sdch/sdch.target.darwin-x86.mk +++ b/sdch/sdch.target.darwin-x86.mk @@ -79,7 +79,6 @@ MY_DEFS := \ '-DNO_TCMALLOC' \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ - '-DENABLE_DOUBLE_RESOURCE_LOAD_TIMING' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_GPU=1' \ diff --git a/sdch/sdch.target.linux-arm.mk b/sdch/sdch.target.linux-arm.mk index 047eb42c67..0e0c537229 100644 --- a/sdch/sdch.target.linux-arm.mk +++ b/sdch/sdch.target.linux-arm.mk @@ -77,7 +77,6 @@ MY_DEFS := \ '-DNO_TCMALLOC' \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ - '-DENABLE_DOUBLE_RESOURCE_LOAD_TIMING' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_GPU=1' \ diff --git a/sdch/sdch.target.linux-x86.mk b/sdch/sdch.target.linux-x86.mk index abeb8b0d53..e81cad5f43 100644 --- a/sdch/sdch.target.linux-x86.mk +++ b/sdch/sdch.target.linux-x86.mk @@ -79,7 +79,6 @@ MY_DEFS := \ '-DNO_TCMALLOC' \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ - '-DENABLE_DOUBLE_RESOURCE_LOAD_TIMING' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_GPU=1' \ |