diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-03-17 15:30:27 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-03-17 15:30:27 +0000 |
| commit | 207005caea600f695ee4fc8da874ed18d86fd67e (patch) | |
| tree | 88b6ab24c20f9f94ea57d5e859d01046998c8823 | |
| parent | ffad59c64eb71ce6e2ca96756503512fd7db87d1 (diff) | |
| download | freetype-207005caea600f695ee4fc8da874ed18d86fd67e.tar.gz | |
Update makefiles after merge of Chromium at 257433
This commit was generated by merge_from_chromium.py.
Change-Id: I2eaace5dd736904e2793d568d9c686fcbb0e72cb
| -rw-r--r-- | ft2.target.darwin-arm.mk | 2 | ||||
| -rw-r--r-- | ft2.target.darwin-mips.mk | 2 | ||||
| -rw-r--r-- | ft2.target.darwin-x86.mk | 2 | ||||
| -rw-r--r-- | ft2.target.linux-arm.mk | 2 | ||||
| -rw-r--r-- | ft2.target.linux-mips.mk | 2 | ||||
| -rw-r--r-- | ft2.target.linux-x86.mk | 2 |
6 files changed, 0 insertions, 12 deletions
diff --git a/ft2.target.darwin-arm.mk b/ft2.target.darwin-arm.mk index 0e5b153..b9a10ba 100644 --- a/ft2.target.darwin-arm.mk +++ b/ft2.target.darwin-arm.mk @@ -90,7 +90,6 @@ MY_DEFS_Debug := \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ - '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_NEW_GAMEPAD_API=1' \ @@ -185,7 +184,6 @@ MY_DEFS_Release := \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ - '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_NEW_GAMEPAD_API=1' \ diff --git a/ft2.target.darwin-mips.mk b/ft2.target.darwin-mips.mk index 7e4ca33..9080567 100644 --- a/ft2.target.darwin-mips.mk +++ b/ft2.target.darwin-mips.mk @@ -90,7 +90,6 @@ MY_DEFS_Debug := \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ - '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_NEW_GAMEPAD_API=1' \ @@ -185,7 +184,6 @@ MY_DEFS_Release := \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ - '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_NEW_GAMEPAD_API=1' \ diff --git a/ft2.target.darwin-x86.mk b/ft2.target.darwin-x86.mk index 4b78c36..8810306 100644 --- a/ft2.target.darwin-x86.mk +++ b/ft2.target.darwin-x86.mk @@ -91,7 +91,6 @@ MY_DEFS_Debug := \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ - '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_NEW_GAMEPAD_API=1' \ @@ -186,7 +185,6 @@ MY_DEFS_Release := \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ - '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_NEW_GAMEPAD_API=1' \ diff --git a/ft2.target.linux-arm.mk b/ft2.target.linux-arm.mk index 0e5b153..b9a10ba 100644 --- a/ft2.target.linux-arm.mk +++ b/ft2.target.linux-arm.mk @@ -90,7 +90,6 @@ MY_DEFS_Debug := \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ - '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_NEW_GAMEPAD_API=1' \ @@ -185,7 +184,6 @@ MY_DEFS_Release := \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ - '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_NEW_GAMEPAD_API=1' \ diff --git a/ft2.target.linux-mips.mk b/ft2.target.linux-mips.mk index 7e4ca33..9080567 100644 --- a/ft2.target.linux-mips.mk +++ b/ft2.target.linux-mips.mk @@ -90,7 +90,6 @@ MY_DEFS_Debug := \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ - '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_NEW_GAMEPAD_API=1' \ @@ -185,7 +184,6 @@ MY_DEFS_Release := \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ - '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_NEW_GAMEPAD_API=1' \ diff --git a/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk index 4b78c36..8810306 100644 --- a/ft2.target.linux-x86.mk +++ b/ft2.target.linux-x86.mk @@ -91,7 +91,6 @@ MY_DEFS_Debug := \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ - '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_NEW_GAMEPAD_API=1' \ @@ -186,7 +185,6 @@ MY_DEFS_Release := \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ - '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_NEW_GAMEPAD_API=1' \ |