diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2013-07-24 00:49:16 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2013-07-24 00:49:16 +0000 |
| commit | 1b4e31f00d6659f47162c45c46b3610036137a1a (patch) | |
| tree | dfa5b50e4c8248e05025aeb5c48b320086d4e8a8 | |
| parent | 4ae6ea5b37ed0e43c3701bccd879af682a433e56 (diff) | |
| download | freetype-1b4e31f00d6659f47162c45c46b3610036137a1a.tar.gz | |
Update makefiles after merge of Chromium at r213294
This commit was generated by merge_from_chromium.py.
Change-Id: I1471596fd881aee2e64fa2d211ed239ac7edb6d3
| -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 3163771..f433a75 100644 --- a/ft2.target.darwin-arm.mk +++ b/ft2.target.darwin-arm.mk @@ -90,6 +90,7 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ @@ -174,6 +175,7 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ diff --git a/ft2.target.darwin-mips.mk b/ft2.target.darwin-mips.mk index 65b1fc8..2f3680a 100644 --- a/ft2.target.darwin-mips.mk +++ b/ft2.target.darwin-mips.mk @@ -90,6 +90,7 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ @@ -174,6 +175,7 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ diff --git a/ft2.target.darwin-x86.mk b/ft2.target.darwin-x86.mk index fa4786d..525a0ee 100644 --- a/ft2.target.darwin-x86.mk +++ b/ft2.target.darwin-x86.mk @@ -92,6 +92,7 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ @@ -179,6 +180,7 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ diff --git a/ft2.target.linux-arm.mk b/ft2.target.linux-arm.mk index 3163771..f433a75 100644 --- a/ft2.target.linux-arm.mk +++ b/ft2.target.linux-arm.mk @@ -90,6 +90,7 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ @@ -174,6 +175,7 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ diff --git a/ft2.target.linux-mips.mk b/ft2.target.linux-mips.mk index 65b1fc8..2f3680a 100644 --- a/ft2.target.linux-mips.mk +++ b/ft2.target.linux-mips.mk @@ -90,6 +90,7 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ @@ -174,6 +175,7 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ diff --git a/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk index fa4786d..525a0ee 100644 --- a/ft2.target.linux-x86.mk +++ b/ft2.target.linux-x86.mk @@ -92,6 +92,7 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ @@ -179,6 +180,7 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ |