From adda09e50de65c9a17d8d24dbbb421d39da1fe00 Mon Sep 17 00:00:00 2001 From: Android Chromium Automerger Date: Tue, 10 Jun 2014 23:37:15 +0000 Subject: Update makefiles after merge of Chromium at 276202 This commit was generated by merge_from_chromium.py. Change-Id: I00be1885a20e1c8d4e5758fa281dca19d3ba4407 --- voice_engine/voice_engine.target.darwin-arm.mk | 2 ++ voice_engine/voice_engine.target.darwin-arm64.mk | 2 ++ voice_engine/voice_engine.target.darwin-mips.mk | 2 ++ voice_engine/voice_engine.target.darwin-x86.mk | 2 ++ voice_engine/voice_engine.target.darwin-x86_64.mk | 2 ++ voice_engine/voice_engine.target.linux-arm.mk | 2 ++ voice_engine/voice_engine.target.linux-arm64.mk | 2 ++ voice_engine/voice_engine.target.linux-mips.mk | 2 ++ voice_engine/voice_engine.target.linux-x86.mk | 2 ++ voice_engine/voice_engine.target.linux-x86_64.mk | 2 ++ 10 files changed, 20 insertions(+) (limited to 'voice_engine') diff --git a/voice_engine/voice_engine.target.darwin-arm.mk b/voice_engine/voice_engine.target.darwin-arm.mk index 00443bd0..d4328e9d 100644 --- a/voice_engine/voice_engine.target.darwin-arm.mk +++ b/voice_engine/voice_engine.target.darwin-arm.mk @@ -105,6 +105,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -228,6 +229,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ diff --git a/voice_engine/voice_engine.target.darwin-arm64.mk b/voice_engine/voice_engine.target.darwin-arm64.mk index 4a9758f2..39d67250 100644 --- a/voice_engine/voice_engine.target.darwin-arm64.mk +++ b/voice_engine/voice_engine.target.darwin-arm64.mk @@ -95,6 +95,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -204,6 +205,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ diff --git a/voice_engine/voice_engine.target.darwin-mips.mk b/voice_engine/voice_engine.target.darwin-mips.mk index 9280e4bf..f4fc8f1b 100644 --- a/voice_engine/voice_engine.target.darwin-mips.mk +++ b/voice_engine/voice_engine.target.darwin-mips.mk @@ -100,6 +100,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -217,6 +218,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ diff --git a/voice_engine/voice_engine.target.darwin-x86.mk b/voice_engine/voice_engine.target.darwin-x86.mk index bf24f0d5..1ebaa732 100644 --- a/voice_engine/voice_engine.target.darwin-x86.mk +++ b/voice_engine/voice_engine.target.darwin-x86.mk @@ -100,6 +100,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -214,6 +215,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ diff --git a/voice_engine/voice_engine.target.darwin-x86_64.mk b/voice_engine/voice_engine.target.darwin-x86_64.mk index bf780ba6..d7b75d22 100644 --- a/voice_engine/voice_engine.target.darwin-x86_64.mk +++ b/voice_engine/voice_engine.target.darwin-x86_64.mk @@ -99,6 +99,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -212,6 +213,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ diff --git a/voice_engine/voice_engine.target.linux-arm.mk b/voice_engine/voice_engine.target.linux-arm.mk index 00443bd0..d4328e9d 100644 --- a/voice_engine/voice_engine.target.linux-arm.mk +++ b/voice_engine/voice_engine.target.linux-arm.mk @@ -105,6 +105,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -228,6 +229,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ diff --git a/voice_engine/voice_engine.target.linux-arm64.mk b/voice_engine/voice_engine.target.linux-arm64.mk index 4a9758f2..39d67250 100644 --- a/voice_engine/voice_engine.target.linux-arm64.mk +++ b/voice_engine/voice_engine.target.linux-arm64.mk @@ -95,6 +95,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -204,6 +205,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ diff --git a/voice_engine/voice_engine.target.linux-mips.mk b/voice_engine/voice_engine.target.linux-mips.mk index 9280e4bf..f4fc8f1b 100644 --- a/voice_engine/voice_engine.target.linux-mips.mk +++ b/voice_engine/voice_engine.target.linux-mips.mk @@ -100,6 +100,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -217,6 +218,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ diff --git a/voice_engine/voice_engine.target.linux-x86.mk b/voice_engine/voice_engine.target.linux-x86.mk index bf24f0d5..1ebaa732 100644 --- a/voice_engine/voice_engine.target.linux-x86.mk +++ b/voice_engine/voice_engine.target.linux-x86.mk @@ -100,6 +100,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -214,6 +215,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ diff --git a/voice_engine/voice_engine.target.linux-x86_64.mk b/voice_engine/voice_engine.target.linux-x86_64.mk index bf780ba6..d7b75d22 100644 --- a/voice_engine/voice_engine.target.linux-x86_64.mk +++ b/voice_engine/voice_engine.target.linux-x86_64.mk @@ -99,6 +99,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -212,6 +213,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ -- cgit v1.2.3