Update makefiles after merge of Chromium at b210e2d62956
This commit was generated by merge_from_chromium.py.
Change-Id: I45f3a2e68f9aba8345109bced72ed8e718cb61e5
diff --git a/ots.target.darwin-arm.mk b/ots.target.darwin-arm.mk
index 04fba81..67e3933 100644
--- a/ots.target.darwin-arm.mk
+++ b/ots.target.darwin-arm.mk
@@ -111,6 +111,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' \
@@ -206,6 +207,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/ots.target.darwin-arm64.mk b/ots.target.darwin-arm64.mk
index 6a5bfec..c0eef4f 100644
--- a/ots.target.darwin-arm64.mk
+++ b/ots.target.darwin-arm64.mk
@@ -100,6 +100,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' \
@@ -183,6 +184,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/ots.target.darwin-mips.mk b/ots.target.darwin-mips.mk
index 79d8e7e..80a7902 100644
--- a/ots.target.darwin-mips.mk
+++ b/ots.target.darwin-mips.mk
@@ -103,6 +103,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' \
@@ -190,6 +191,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/ots.target.darwin-x86.mk b/ots.target.darwin-x86.mk
index d9b8dd6..49d836a 100644
--- a/ots.target.darwin-x86.mk
+++ b/ots.target.darwin-x86.mk
@@ -106,6 +106,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' \
@@ -195,6 +196,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/ots.target.darwin-x86_64.mk b/ots.target.darwin-x86_64.mk
index 68c31dd..3ecd8c2 100644
--- a/ots.target.darwin-x86_64.mk
+++ b/ots.target.darwin-x86_64.mk
@@ -105,6 +105,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' \
@@ -193,6 +194,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/ots.target.linux-arm.mk b/ots.target.linux-arm.mk
index 04fba81..67e3933 100644
--- a/ots.target.linux-arm.mk
+++ b/ots.target.linux-arm.mk
@@ -111,6 +111,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' \
@@ -206,6 +207,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/ots.target.linux-arm64.mk b/ots.target.linux-arm64.mk
index 6a5bfec..c0eef4f 100644
--- a/ots.target.linux-arm64.mk
+++ b/ots.target.linux-arm64.mk
@@ -100,6 +100,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' \
@@ -183,6 +184,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/ots.target.linux-mips.mk b/ots.target.linux-mips.mk
index 79d8e7e..80a7902 100644
--- a/ots.target.linux-mips.mk
+++ b/ots.target.linux-mips.mk
@@ -103,6 +103,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' \
@@ -190,6 +191,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/ots.target.linux-x86.mk b/ots.target.linux-x86.mk
index d9b8dd6..49d836a 100644
--- a/ots.target.linux-x86.mk
+++ b/ots.target.linux-x86.mk
@@ -106,6 +106,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' \
@@ -195,6 +196,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/ots.target.linux-x86_64.mk b/ots.target.linux-x86_64.mk
index 68c31dd..3ecd8c2 100644
--- a/ots.target.linux-x86_64.mk
+++ b/ots.target.linux-x86_64.mk
@@ -105,6 +105,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' \
@@ -193,6 +194,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' \
