diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-05-24 13:49:06 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-05-24 13:49:06 +0000 |
| commit | bde06d3764145da4155c4eca565049e5445f3f19 (patch) | |
| tree | edcdc52a33eb0fd2cbee66b62773c3596bf003f9 | |
| parent | 1b75e9f56d1465d6af086b17cdf270b44ca3502f (diff) | |
| download | freetype-bde06d3764145da4155c4eca565049e5445f3f19.tar.gz | |
Update makefiles after merge of Chromium at 272740
This commit was generated by merge_from_chromium.py.
Change-Id: Ie7d5b75c85f35eb6c83281d5bebb5b9ed590b417
| -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 f4ed6c9..bc4479f 100644 --- a/ft2.target.darwin-arm.mk +++ b/ft2.target.darwin-arm.mk @@ -100,6 +100,7 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ @@ -206,6 +207,7 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ diff --git a/ft2.target.darwin-arm64.mk b/ft2.target.darwin-arm64.mk index 0cdcfb4..d35ee4f 100644 --- a/ft2.target.darwin-arm64.mk +++ b/ft2.target.darwin-arm64.mk @@ -90,6 +90,7 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ @@ -185,6 +186,7 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ diff --git a/ft2.target.darwin-mips.mk b/ft2.target.darwin-mips.mk index 3349c05..1cf3d82 100644 --- a/ft2.target.darwin-mips.mk +++ b/ft2.target.darwin-mips.mk @@ -95,6 +95,7 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ @@ -196,6 +197,7 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ diff --git a/ft2.target.darwin-x86.mk b/ft2.target.darwin-x86.mk index 2a8654e..4cc5972 100644 --- a/ft2.target.darwin-x86.mk +++ b/ft2.target.darwin-x86.mk @@ -95,6 +95,7 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ @@ -195,6 +196,7 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ diff --git a/ft2.target.darwin-x86_64.mk b/ft2.target.darwin-x86_64.mk index 8725fcc..339cfb4 100644 --- a/ft2.target.darwin-x86_64.mk +++ b/ft2.target.darwin-x86_64.mk @@ -94,6 +94,7 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ @@ -193,6 +194,7 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ diff --git a/ft2.target.linux-arm.mk b/ft2.target.linux-arm.mk index f4ed6c9..bc4479f 100644 --- a/ft2.target.linux-arm.mk +++ b/ft2.target.linux-arm.mk @@ -100,6 +100,7 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ @@ -206,6 +207,7 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ diff --git a/ft2.target.linux-arm64.mk b/ft2.target.linux-arm64.mk index 0cdcfb4..d35ee4f 100644 --- a/ft2.target.linux-arm64.mk +++ b/ft2.target.linux-arm64.mk @@ -90,6 +90,7 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ @@ -185,6 +186,7 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ diff --git a/ft2.target.linux-mips.mk b/ft2.target.linux-mips.mk index 3349c05..1cf3d82 100644 --- a/ft2.target.linux-mips.mk +++ b/ft2.target.linux-mips.mk @@ -95,6 +95,7 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ @@ -196,6 +197,7 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ diff --git a/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk index 2a8654e..4cc5972 100644 --- a/ft2.target.linux-x86.mk +++ b/ft2.target.linux-x86.mk @@ -95,6 +95,7 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ @@ -195,6 +196,7 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ diff --git a/ft2.target.linux-x86_64.mk b/ft2.target.linux-x86_64.mk index 8725fcc..339cfb4 100644 --- a/ft2.target.linux-x86_64.mk +++ b/ft2.target.linux-x86_64.mk @@ -94,6 +94,7 @@ MY_DEFS_Debug := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ @@ -193,6 +194,7 @@ MY_DEFS_Release := \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ |