diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2013-05-29 04:06:16 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2013-05-29 04:06:16 +0000 |
| commit | fd5aa67419284cf4fb9609fd57742fc34ebf81f4 (patch) | |
| tree | 15d9bc0389a22219684f8d8b798ead6d4baeeb4d | |
| parent | 9fec8b2a459bb8d4b03f8977c87e2a770a7ba8b5 (diff) | |
| download | freetype-fd5aa67419284cf4fb9609fd57742fc34ebf81f4.tar.gz | |
Update makefiles after merge of Chromium at r202768
This commit was generated by merge_from_chromium.py.
Change-Id: I864932a0c11f565108bbdfcfd8f72baf2f827152
| -rw-r--r-- | ft2.target.darwin-arm.mk | 1 | ||||
| -rw-r--r-- | ft2.target.darwin-x86.mk | 1 | ||||
| -rw-r--r-- | ft2.target.linux-arm.mk | 1 | ||||
| -rw-r--r-- | ft2.target.linux-x86.mk | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/ft2.target.darwin-arm.mk b/ft2.target.darwin-arm.mk index 55cf8c2..1671257 100644 --- a/ft2.target.darwin-arm.mk +++ b/ft2.target.darwin-arm.mk @@ -88,6 +88,7 @@ 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/ft2.target.darwin-x86.mk b/ft2.target.darwin-x86.mk index d4bafd1..5cff40d 100644 --- a/ft2.target.darwin-x86.mk +++ b/ft2.target.darwin-x86.mk @@ -90,6 +90,7 @@ 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/ft2.target.linux-arm.mk b/ft2.target.linux-arm.mk index 55cf8c2..1671257 100644 --- a/ft2.target.linux-arm.mk +++ b/ft2.target.linux-arm.mk @@ -88,6 +88,7 @@ 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/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk index d4bafd1..5cff40d 100644 --- a/ft2.target.linux-x86.mk +++ b/ft2.target.linux-x86.mk @@ -90,6 +90,7 @@ MY_DEFS := \ '-DNO_TCMALLOC' \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ + '-DENABLE_DOUBLE_RESOURCE_LOAD_TIMING' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_GPU=1' \ |