diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-10-31 19:08:27 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-10-31 19:08:27 +0000 |
| commit | fd088f44f67b6da302199ccf90a0b930c6586e8c (patch) | |
| tree | e9c9120ebc01c8b6f20450cdb4d0783798a3f29d | |
| parent | 9383e0c6751f859ea8e67e05e1a00dd7b55e7e58 (diff) | |
| download | freetype-fd088f44f67b6da302199ccf90a0b930c6586e8c.tar.gz | |
Update makefiles after merge of Chromium at b210e2d62956
This commit was generated by merge_from_chromium.py.
Change-Id: Ic4062ef4ab74da6c463721c47e3197b8812fa2ab
| -rw-r--r-- | ft2.target.darwin-arm.mk | 2 | ||||
| -rw-r--r-- | ft2.target.darwin-arm64.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.darwin-x86_64.mk | 2 | ||||
| -rw-r--r-- | ft2.target.linux-arm.mk | 2 | ||||
| -rw-r--r-- | ft2.target.linux-arm64.mk | 2 | ||||
| -rw-r--r-- | ft2.target.linux-mips.mk | 2 | ||||
| -rw-r--r-- | ft2.target.linux-x86.mk | 2 | ||||
| -rw-r--r-- | ft2.target.linux-x86_64.mk | 2 |
10 files changed, 20 insertions, 0 deletions
diff --git a/ft2.target.darwin-arm.mk b/ft2.target.darwin-arm.mk index a538628..1cfff90 100644 --- a/ft2.target.darwin-arm.mk +++ b/ft2.target.darwin-arm.mk @@ -100,6 +100,7 @@ MY_DEFS_Debug := \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DCLD_VERSION=1' \ @@ -203,6 +204,7 @@ MY_DEFS_Release := \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DCLD_VERSION=1' \ diff --git a/ft2.target.darwin-arm64.mk b/ft2.target.darwin-arm64.mk index 3d9968e..bb2ff97 100644 --- a/ft2.target.darwin-arm64.mk +++ b/ft2.target.darwin-arm64.mk @@ -89,6 +89,7 @@ MY_DEFS_Debug := \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DCLD_VERSION=1' \ @@ -180,6 +181,7 @@ MY_DEFS_Release := \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DCLD_VERSION=1' \ diff --git a/ft2.target.darwin-mips.mk b/ft2.target.darwin-mips.mk index 8e02ca3..960a09e 100644 --- a/ft2.target.darwin-mips.mk +++ b/ft2.target.darwin-mips.mk @@ -93,6 +93,7 @@ MY_DEFS_Debug := \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DCLD_VERSION=1' \ @@ -189,6 +190,7 @@ MY_DEFS_Release := \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DCLD_VERSION=1' \ diff --git a/ft2.target.darwin-x86.mk b/ft2.target.darwin-x86.mk index 0ea96b5..45ddab3 100644 --- a/ft2.target.darwin-x86.mk +++ b/ft2.target.darwin-x86.mk @@ -95,6 +95,7 @@ MY_DEFS_Debug := \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DCLD_VERSION=1' \ @@ -192,6 +193,7 @@ MY_DEFS_Release := \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DCLD_VERSION=1' \ diff --git a/ft2.target.darwin-x86_64.mk b/ft2.target.darwin-x86_64.mk index c3b55a7..fb65a67 100644 --- a/ft2.target.darwin-x86_64.mk +++ b/ft2.target.darwin-x86_64.mk @@ -94,6 +94,7 @@ MY_DEFS_Debug := \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DCLD_VERSION=1' \ @@ -190,6 +191,7 @@ MY_DEFS_Release := \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DCLD_VERSION=1' \ diff --git a/ft2.target.linux-arm.mk b/ft2.target.linux-arm.mk index a538628..1cfff90 100644 --- a/ft2.target.linux-arm.mk +++ b/ft2.target.linux-arm.mk @@ -100,6 +100,7 @@ MY_DEFS_Debug := \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DCLD_VERSION=1' \ @@ -203,6 +204,7 @@ MY_DEFS_Release := \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DCLD_VERSION=1' \ diff --git a/ft2.target.linux-arm64.mk b/ft2.target.linux-arm64.mk index 3d9968e..bb2ff97 100644 --- a/ft2.target.linux-arm64.mk +++ b/ft2.target.linux-arm64.mk @@ -89,6 +89,7 @@ MY_DEFS_Debug := \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DCLD_VERSION=1' \ @@ -180,6 +181,7 @@ MY_DEFS_Release := \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DCLD_VERSION=1' \ diff --git a/ft2.target.linux-mips.mk b/ft2.target.linux-mips.mk index 8e02ca3..960a09e 100644 --- a/ft2.target.linux-mips.mk +++ b/ft2.target.linux-mips.mk @@ -93,6 +93,7 @@ MY_DEFS_Debug := \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DCLD_VERSION=1' \ @@ -189,6 +190,7 @@ MY_DEFS_Release := \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DCLD_VERSION=1' \ diff --git a/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk index 0ea96b5..45ddab3 100644 --- a/ft2.target.linux-x86.mk +++ b/ft2.target.linux-x86.mk @@ -95,6 +95,7 @@ MY_DEFS_Debug := \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DCLD_VERSION=1' \ @@ -192,6 +193,7 @@ MY_DEFS_Release := \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DCLD_VERSION=1' \ diff --git a/ft2.target.linux-x86_64.mk b/ft2.target.linux-x86_64.mk index c3b55a7..fb65a67 100644 --- a/ft2.target.linux-x86_64.mk +++ b/ft2.target.linux-x86_64.mk @@ -94,6 +94,7 @@ MY_DEFS_Debug := \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DCLD_VERSION=1' \ @@ -190,6 +191,7 @@ MY_DEFS_Release := \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DCLD_VERSION=1' \ |