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 | 78d9f8c6003fb7ab5e24c681ef4b0dbfe4dfc3f3 (patch) | |
tree | a15a2628e4c4d7ec230b658b432c025e6634ef8a | |
parent | 34c57b1d576dff7cc5da9264e27c6f8fcb2b3044 (diff) | |
download | libyuv-78d9f8c6003fb7ab5e24c681ef4b0dbfe4dfc3f3.tar.gz |
Update makefiles after merge of Chromium at b210e2d62956
This commit was generated by merge_from_chromium.py.
Change-Id: I836c553c9d428fe38304f32940b111f805eed1c8
-rw-r--r-- | libyuv.target.darwin-arm.mk | 2 | ||||
-rw-r--r-- | libyuv.target.darwin-arm64.mk | 2 | ||||
-rw-r--r-- | libyuv.target.darwin-mips.mk | 2 | ||||
-rw-r--r-- | libyuv.target.darwin-x86.mk | 2 | ||||
-rw-r--r-- | libyuv.target.darwin-x86_64.mk | 2 | ||||
-rw-r--r-- | libyuv.target.linux-arm.mk | 2 | ||||
-rw-r--r-- | libyuv.target.linux-arm64.mk | 2 | ||||
-rw-r--r-- | libyuv.target.linux-mips.mk | 2 | ||||
-rw-r--r-- | libyuv.target.linux-x86.mk | 2 | ||||
-rw-r--r-- | libyuv.target.linux-x86_64.mk | 2 | ||||
-rw-r--r-- | libyuv_neon.target.darwin-arm.mk | 2 | ||||
-rw-r--r-- | libyuv_neon.target.darwin-arm64.mk | 2 | ||||
-rw-r--r-- | libyuv_neon.target.linux-arm.mk | 2 | ||||
-rw-r--r-- | libyuv_neon.target.linux-arm64.mk | 2 |
14 files changed, 28 insertions, 0 deletions
diff --git a/libyuv.target.darwin-arm.mk b/libyuv.target.darwin-arm.mk index c9ac98b..711b67f 100644 --- a/libyuv.target.darwin-arm.mk +++ b/libyuv.target.darwin-arm.mk @@ -112,6 +112,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/libyuv.target.darwin-arm64.mk b/libyuv.target.darwin-arm64.mk index 8ae4797..c5a7268 100644 --- a/libyuv.target.darwin-arm64.mk +++ b/libyuv.target.darwin-arm64.mk @@ -101,6 +101,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' \ @@ -187,6 +188,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/libyuv.target.darwin-mips.mk b/libyuv.target.darwin-mips.mk index 4fe6848..65cf13e 100644 --- a/libyuv.target.darwin-mips.mk +++ b/libyuv.target.darwin-mips.mk @@ -105,6 +105,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' \ @@ -196,6 +197,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/libyuv.target.darwin-x86.mk b/libyuv.target.darwin-x86.mk index eb14e9b..b5eb9b9 100644 --- a/libyuv.target.darwin-x86.mk +++ b/libyuv.target.darwin-x86.mk @@ -107,6 +107,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' \ @@ -199,6 +200,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/libyuv.target.darwin-x86_64.mk b/libyuv.target.darwin-x86_64.mk index 92a6771..b89a57e 100644 --- a/libyuv.target.darwin-x86_64.mk +++ b/libyuv.target.darwin-x86_64.mk @@ -106,6 +106,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' \ @@ -197,6 +198,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/libyuv.target.linux-arm.mk b/libyuv.target.linux-arm.mk index c9ac98b..711b67f 100644 --- a/libyuv.target.linux-arm.mk +++ b/libyuv.target.linux-arm.mk @@ -112,6 +112,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/libyuv.target.linux-arm64.mk b/libyuv.target.linux-arm64.mk index 8ae4797..c5a7268 100644 --- a/libyuv.target.linux-arm64.mk +++ b/libyuv.target.linux-arm64.mk @@ -101,6 +101,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' \ @@ -187,6 +188,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/libyuv.target.linux-mips.mk b/libyuv.target.linux-mips.mk index 4fe6848..65cf13e 100644 --- a/libyuv.target.linux-mips.mk +++ b/libyuv.target.linux-mips.mk @@ -105,6 +105,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' \ @@ -196,6 +197,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/libyuv.target.linux-x86.mk b/libyuv.target.linux-x86.mk index eb14e9b..b5eb9b9 100644 --- a/libyuv.target.linux-x86.mk +++ b/libyuv.target.linux-x86.mk @@ -107,6 +107,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' \ @@ -199,6 +200,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/libyuv.target.linux-x86_64.mk b/libyuv.target.linux-x86_64.mk index 92a6771..b89a57e 100644 --- a/libyuv.target.linux-x86_64.mk +++ b/libyuv.target.linux-x86_64.mk @@ -106,6 +106,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' \ @@ -197,6 +198,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/libyuv_neon.target.darwin-arm.mk b/libyuv_neon.target.darwin-arm.mk index e1bff14..9f53079 100644 --- a/libyuv_neon.target.darwin-arm.mk +++ b/libyuv_neon.target.darwin-arm.mk @@ -90,6 +90,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' \ @@ -187,6 +188,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/libyuv_neon.target.darwin-arm64.mk b/libyuv_neon.target.darwin-arm64.mk index 3e4fa20..5ec19a8 100644 --- a/libyuv_neon.target.darwin-arm64.mk +++ b/libyuv_neon.target.darwin-arm64.mk @@ -78,6 +78,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' \ @@ -162,6 +163,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/libyuv_neon.target.linux-arm.mk b/libyuv_neon.target.linux-arm.mk index e1bff14..9f53079 100644 --- a/libyuv_neon.target.linux-arm.mk +++ b/libyuv_neon.target.linux-arm.mk @@ -90,6 +90,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' \ @@ -187,6 +188,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/libyuv_neon.target.linux-arm64.mk b/libyuv_neon.target.linux-arm64.mk index 3e4fa20..5ec19a8 100644 --- a/libyuv_neon.target.linux-arm64.mk +++ b/libyuv_neon.target.linux-arm64.mk @@ -78,6 +78,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' \ @@ -162,6 +163,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' \ |