From 26276ce264e009bdddd904f15f202791c98ae134 Mon Sep 17 00:00:00 2001 From: Android Chromium Automerger Date: Fri, 31 May 2013 09:20:19 +0000 Subject: Update makefiles after merge of Chromium at r203377 This commit was generated by merge_from_chromium.py. Change-Id: I8cb62c05bc6ef85d99abf02d43c7a52fca0eac99 --- ft2.target.darwin-arm.mk | 1 - ft2.target.darwin-x86.mk | 1 - ft2.target.linux-arm.mk | 1 - ft2.target.linux-x86.mk | 1 - 4 files changed, 4 deletions(-) diff --git a/ft2.target.darwin-arm.mk b/ft2.target.darwin-arm.mk index 1671257..55cf8c2 100644 --- a/ft2.target.darwin-arm.mk +++ b/ft2.target.darwin-arm.mk @@ -88,7 +88,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/ft2.target.darwin-x86.mk b/ft2.target.darwin-x86.mk index 5cff40d..d4bafd1 100644 --- a/ft2.target.darwin-x86.mk +++ b/ft2.target.darwin-x86.mk @@ -90,7 +90,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/ft2.target.linux-arm.mk b/ft2.target.linux-arm.mk index 1671257..55cf8c2 100644 --- a/ft2.target.linux-arm.mk +++ b/ft2.target.linux-arm.mk @@ -88,7 +88,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/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk index 5cff40d..d4bafd1 100644 --- a/ft2.target.linux-x86.mk +++ b/ft2.target.linux-x86.mk @@ -90,7 +90,6 @@ MY_DEFS := \ '-DNO_TCMALLOC' \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ - '-DENABLE_DOUBLE_RESOURCE_LOAD_TIMING' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_GPU=1' \ -- cgit v1.2.3