Update makefiles after merge of Chromium at b210e2d62956
This commit was generated by merge_from_chromium.py.
Change-Id: I6d9f1bf607c5c556b95e8dddf36b6e6ef548ee42
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 @@
'-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 @@
'-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 @@
'-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 @@
'-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 @@
'-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 @@
'-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 @@
'-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 @@
'-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 @@
'-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 @@
'-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 @@
'-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 @@
'-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 @@
'-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 @@
'-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 @@
'-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 @@
'-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 @@
'-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 @@
'-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 @@
'-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 @@
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_BROWSER_CDMS' \
'-DENABLE_CONFIGURATION_POLICY' \
+ '-DENABLE_NOTIFICATIONS' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DCLD_VERSION=1' \
