diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-02-25 10:11:59 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-02-25 10:11:59 +0000 |
| commit | f5d3b34f87203440155c83fd71454313cf707c2d (patch) | |
| tree | 782d8d8058a834a2323f08cf4cb629d0812050b2 | |
| parent | b48ef4fe0cb1cde4cbdb2aeedc8e932e7443ce57 (diff) | |
| download | freetype-f5d3b34f87203440155c83fd71454313cf707c2d.tar.gz | |
Update makefiles after merge of Chromium at 253112
This commit was generated by merge_from_chromium.py.
Change-Id: I82e5d6ef97555aea1982d30ed0d57ed2e65d5d9a
| -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, 12 insertions, 0 deletions
diff --git a/ft2.target.darwin-arm.mk b/ft2.target.darwin-arm.mk index b0feb2e..28539c0 100644 --- a/ft2.target.darwin-arm.mk +++ b/ft2.target.darwin-arm.mk @@ -89,6 +89,7 @@ MY_DEFS_Debug := \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ + '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ @@ -181,6 +182,7 @@ MY_DEFS_Release := \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ + '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ diff --git a/ft2.target.darwin-mips.mk b/ft2.target.darwin-mips.mk index 3c51669..eaf4b3d 100644 --- a/ft2.target.darwin-mips.mk +++ b/ft2.target.darwin-mips.mk @@ -89,6 +89,7 @@ MY_DEFS_Debug := \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ + '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ @@ -181,6 +182,7 @@ MY_DEFS_Release := \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ + '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ diff --git a/ft2.target.darwin-x86.mk b/ft2.target.darwin-x86.mk index d97c3bc..b9c8f08 100644 --- a/ft2.target.darwin-x86.mk +++ b/ft2.target.darwin-x86.mk @@ -91,6 +91,7 @@ MY_DEFS_Debug := \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ + '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ @@ -184,6 +185,7 @@ MY_DEFS_Release := \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ + '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ diff --git a/ft2.target.linux-arm.mk b/ft2.target.linux-arm.mk index b0feb2e..28539c0 100644 --- a/ft2.target.linux-arm.mk +++ b/ft2.target.linux-arm.mk @@ -89,6 +89,7 @@ MY_DEFS_Debug := \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ + '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ @@ -181,6 +182,7 @@ MY_DEFS_Release := \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ + '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ diff --git a/ft2.target.linux-mips.mk b/ft2.target.linux-mips.mk index 3c51669..eaf4b3d 100644 --- a/ft2.target.linux-mips.mk +++ b/ft2.target.linux-mips.mk @@ -89,6 +89,7 @@ MY_DEFS_Debug := \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ + '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ @@ -181,6 +182,7 @@ MY_DEFS_Release := \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ + '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ diff --git a/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk index d97c3bc..b9c8f08 100644 --- a/ft2.target.linux-x86.mk +++ b/ft2.target.linux-x86.mk @@ -91,6 +91,7 @@ MY_DEFS_Debug := \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ + '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ @@ -184,6 +185,7 @@ MY_DEFS_Release := \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ + '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ |