diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-10-31 19:08:28 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-10-31 19:08:28 +0000 |
| commit | e8eb4438b3467f2be6dcd65b585ca194937f217c (patch) | |
| tree | 0667e42b5428c8b34ea18f430ed31a8026308d59 | |
| parent | 8424e18c39fb20543e55ce973c676d4928f15b8c (diff) | |
| download | libjpeg_turbo-e8eb4438b3467f2be6dcd65b585ca194937f217c.tar.gz | |
Update makefiles after merge of Chromium at b210e2d62956
This commit was generated by merge_from_chromium.py.
Change-Id: I6d9f1bf607c5c556b95e8dddf36b6e6ef548ee42
| -rw-r--r-- | libjpeg.target.darwin-arm.mk | 2 | ||||
| -rw-r--r-- | libjpeg.target.darwin-arm64.mk | 2 | ||||
| -rw-r--r-- | libjpeg.target.darwin-mips.mk | 2 | ||||
| -rw-r--r-- | libjpeg.target.darwin-x86.mk | 2 | ||||
| -rw-r--r-- | libjpeg.target.darwin-x86_64.mk | 2 | ||||
| -rw-r--r-- | libjpeg.target.linux-arm.mk | 2 | ||||
| -rw-r--r-- | libjpeg.target.linux-arm64.mk | 2 | ||||
| -rw-r--r-- | libjpeg.target.linux-mips.mk | 2 | ||||
| -rw-r--r-- | libjpeg.target.linux-x86.mk | 2 | ||||
| -rw-r--r-- | libjpeg.target.linux-x86_64.mk | 2 |
10 files changed, 20 insertions, 0 deletions
diff --git a/libjpeg.target.darwin-arm.mk b/libjpeg.target.darwin-arm.mk index 8c55003..a3bc170 100644 --- a/libjpeg.target.darwin-arm.mk +++ b/libjpeg.target.darwin-arm.mk @@ -127,6 +127,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' \ @@ -225,6 +226,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/libjpeg.target.darwin-arm64.mk b/libjpeg.target.darwin-arm64.mk index 36c41c2..d698aef 100644 --- a/libjpeg.target.darwin-arm64.mk +++ b/libjpeg.target.darwin-arm64.mk @@ -116,6 +116,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' \ @@ -202,6 +203,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/libjpeg.target.darwin-mips.mk b/libjpeg.target.darwin-mips.mk index c56a25e..c0116db 100644 --- a/libjpeg.target.darwin-mips.mk +++ b/libjpeg.target.darwin-mips.mk @@ -119,6 +119,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' \ @@ -210,6 +211,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/libjpeg.target.darwin-x86.mk b/libjpeg.target.darwin-x86.mk index 08aea74..9365b0f 100644 --- a/libjpeg.target.darwin-x86.mk +++ b/libjpeg.target.darwin-x86.mk @@ -488,6 +488,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' \ @@ -580,6 +581,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/libjpeg.target.darwin-x86_64.mk b/libjpeg.target.darwin-x86_64.mk index 6df9f76..345c7de 100644 --- a/libjpeg.target.darwin-x86_64.mk +++ b/libjpeg.target.darwin-x86_64.mk @@ -289,6 +289,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' \ @@ -380,6 +381,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/libjpeg.target.linux-arm.mk b/libjpeg.target.linux-arm.mk index 8c55003..a3bc170 100644 --- a/libjpeg.target.linux-arm.mk +++ b/libjpeg.target.linux-arm.mk @@ -127,6 +127,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' \ @@ -225,6 +226,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/libjpeg.target.linux-arm64.mk b/libjpeg.target.linux-arm64.mk index 36c41c2..d698aef 100644 --- a/libjpeg.target.linux-arm64.mk +++ b/libjpeg.target.linux-arm64.mk @@ -116,6 +116,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' \ @@ -202,6 +203,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/libjpeg.target.linux-mips.mk b/libjpeg.target.linux-mips.mk index c56a25e..c0116db 100644 --- a/libjpeg.target.linux-mips.mk +++ b/libjpeg.target.linux-mips.mk @@ -119,6 +119,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' \ @@ -210,6 +211,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/libjpeg.target.linux-x86.mk b/libjpeg.target.linux-x86.mk index 08aea74..9365b0f 100644 --- a/libjpeg.target.linux-x86.mk +++ b/libjpeg.target.linux-x86.mk @@ -488,6 +488,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' \ @@ -580,6 +581,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/libjpeg.target.linux-x86_64.mk b/libjpeg.target.linux-x86_64.mk index 6df9f76..345c7de 100644 --- a/libjpeg.target.linux-x86_64.mk +++ b/libjpeg.target.linux-x86_64.mk @@ -289,6 +289,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' \ @@ -380,6 +381,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' \ |