Merge from Chromium at DEPS revision 278205

This commit was generated by merge_to_master.py.

Change-Id: Iabd636d9f02be0b2aa1da9912eddb0f28f864124

10 files changed, 40 insertions, 0 deletions

diff --git a/libsrtp.target.darwin-arm.mk b/libsrtp.target.darwin-arm.mk
index 92b2045..c0aa58c 100644
--- a/libsrtp.target.darwin-arm.mk
+++ b/libsrtp.target.darwin-arm.mk
@@ -117,6 +117,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' \
@@ -146,6 +147,7 @@ LOCAL_C_INCLUDES_Debug := \
 	$(LOCAL_PATH)/third_party/libsrtp/config \
 	$(LOCAL_PATH)/third_party/libsrtp/srtp/include \
 	$(LOCAL_PATH)/third_party/libsrtp/srtp/crypto/include \
+	$(gyp_shared_intermediate_dir) \
 	$(PWD)/frameworks/wilhelm/include \
 	$(PWD)/bionic \
 	$(PWD)/external/stlport/stlport
@@ -231,6 +233,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' \
@@ -260,6 +263,7 @@ LOCAL_C_INCLUDES_Release := \
 	$(LOCAL_PATH)/third_party/libsrtp/config \
 	$(LOCAL_PATH)/third_party/libsrtp/srtp/include \
 	$(LOCAL_PATH)/third_party/libsrtp/srtp/crypto/include \
+	$(gyp_shared_intermediate_dir) \
 	$(PWD)/frameworks/wilhelm/include \
 	$(PWD)/bionic \
 	$(PWD)/external/stlport/stlport
diff --git a/libsrtp.target.darwin-arm64.mk b/libsrtp.target.darwin-arm64.mk
index eb797e7..ca51ff0 100644
--- a/libsrtp.target.darwin-arm64.mk
+++ b/libsrtp.target.darwin-arm64.mk
@@ -107,6 +107,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' \
@@ -136,6 +137,7 @@ LOCAL_C_INCLUDES_Debug := \
 	$(LOCAL_PATH)/third_party/libsrtp/config \
 	$(LOCAL_PATH)/third_party/libsrtp/srtp/include \
 	$(LOCAL_PATH)/third_party/libsrtp/srtp/crypto/include \
+	$(gyp_shared_intermediate_dir) \
 	$(PWD)/frameworks/wilhelm/include \
 	$(PWD)/bionic \
 	$(PWD)/external/stlport/stlport
@@ -210,6 +212,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' \
@@ -239,6 +242,7 @@ LOCAL_C_INCLUDES_Release := \
 	$(LOCAL_PATH)/third_party/libsrtp/config \
 	$(LOCAL_PATH)/third_party/libsrtp/srtp/include \
 	$(LOCAL_PATH)/third_party/libsrtp/srtp/crypto/include \
+	$(gyp_shared_intermediate_dir) \
 	$(PWD)/frameworks/wilhelm/include \
 	$(PWD)/bionic \
 	$(PWD)/external/stlport/stlport
diff --git a/libsrtp.target.darwin-mips.mk b/libsrtp.target.darwin-mips.mk
index 8b7766e..16f180c 100644
--- a/libsrtp.target.darwin-mips.mk
+++ b/libsrtp.target.darwin-mips.mk
@@ -112,6 +112,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' \
@@ -141,6 +142,7 @@ LOCAL_C_INCLUDES_Debug := \
 	$(LOCAL_PATH)/third_party/libsrtp/config \
 	$(LOCAL_PATH)/third_party/libsrtp/srtp/include \
 	$(LOCAL_PATH)/third_party/libsrtp/srtp/crypto/include \
+	$(gyp_shared_intermediate_dir) \
 	$(PWD)/frameworks/wilhelm/include \
 	$(PWD)/bionic \
 	$(PWD)/external/stlport/stlport
@@ -221,6 +223,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' \
@@ -250,6 +253,7 @@ LOCAL_C_INCLUDES_Release := \
 	$(LOCAL_PATH)/third_party/libsrtp/config \
 	$(LOCAL_PATH)/third_party/libsrtp/srtp/include \
 	$(LOCAL_PATH)/third_party/libsrtp/srtp/crypto/include \
+	$(gyp_shared_intermediate_dir) \
 	$(PWD)/frameworks/wilhelm/include \
 	$(PWD)/bionic \
 	$(PWD)/external/stlport/stlport
diff --git a/libsrtp.target.darwin-x86.mk b/libsrtp.target.darwin-x86.mk
index 0bd1ef7..e3ec5c0 100644
--- a/libsrtp.target.darwin-x86.mk
+++ b/libsrtp.target.darwin-x86.mk
@@ -112,6 +112,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' \
@@ -141,6 +142,7 @@ LOCAL_C_INCLUDES_Debug := \
 	$(LOCAL_PATH)/third_party/libsrtp/config \
 	$(LOCAL_PATH)/third_party/libsrtp/srtp/include \
 	$(LOCAL_PATH)/third_party/libsrtp/srtp/crypto/include \
+	$(gyp_shared_intermediate_dir) \
 	$(PWD)/frameworks/wilhelm/include \
 	$(PWD)/bionic \
 	$(PWD)/external/stlport/stlport
@@ -220,6 +222,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' \
@@ -249,6 +252,7 @@ LOCAL_C_INCLUDES_Release := \
 	$(LOCAL_PATH)/third_party/libsrtp/config \
 	$(LOCAL_PATH)/third_party/libsrtp/srtp/include \
 	$(LOCAL_PATH)/third_party/libsrtp/srtp/crypto/include \
+	$(gyp_shared_intermediate_dir) \
 	$(PWD)/frameworks/wilhelm/include \
 	$(PWD)/bionic \
 	$(PWD)/external/stlport/stlport
diff --git a/libsrtp.target.darwin-x86_64.mk b/libsrtp.target.darwin-x86_64.mk
index 4bd1ace..18aa79b 100644
--- a/libsrtp.target.darwin-x86_64.mk
+++ b/libsrtp.target.darwin-x86_64.mk
@@ -111,6 +111,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' \
@@ -140,6 +141,7 @@ LOCAL_C_INCLUDES_Debug := \
 	$(LOCAL_PATH)/third_party/libsrtp/config \
 	$(LOCAL_PATH)/third_party/libsrtp/srtp/include \
 	$(LOCAL_PATH)/third_party/libsrtp/srtp/crypto/include \
+	$(gyp_shared_intermediate_dir) \
 	$(PWD)/frameworks/wilhelm/include \
 	$(PWD)/bionic \
 	$(PWD)/external/stlport/stlport
@@ -218,6 +220,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' \
@@ -247,6 +250,7 @@ LOCAL_C_INCLUDES_Release := \
 	$(LOCAL_PATH)/third_party/libsrtp/config \
 	$(LOCAL_PATH)/third_party/libsrtp/srtp/include \
 	$(LOCAL_PATH)/third_party/libsrtp/srtp/crypto/include \
+	$(gyp_shared_intermediate_dir) \
 	$(PWD)/frameworks/wilhelm/include \
 	$(PWD)/bionic \
 	$(PWD)/external/stlport/stlport
diff --git a/libsrtp.target.linux-arm.mk b/libsrtp.target.linux-arm.mk
index 92b2045..c0aa58c 100644
--- a/libsrtp.target.linux-arm.mk
+++ b/libsrtp.target.linux-arm.mk
@@ -117,6 +117,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' \
@@ -146,6 +147,7 @@ LOCAL_C_INCLUDES_Debug := \
 	$(LOCAL_PATH)/third_party/libsrtp/config \
 	$(LOCAL_PATH)/third_party/libsrtp/srtp/include \
 	$(LOCAL_PATH)/third_party/libsrtp/srtp/crypto/include \
+	$(gyp_shared_intermediate_dir) \
 	$(PWD)/frameworks/wilhelm/include \
 	$(PWD)/bionic \
 	$(PWD)/external/stlport/stlport
@@ -231,6 +233,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' \
@@ -260,6 +263,7 @@ LOCAL_C_INCLUDES_Release := \
 	$(LOCAL_PATH)/third_party/libsrtp/config \
 	$(LOCAL_PATH)/third_party/libsrtp/srtp/include \
 	$(LOCAL_PATH)/third_party/libsrtp/srtp/crypto/include \
+	$(gyp_shared_intermediate_dir) \
 	$(PWD)/frameworks/wilhelm/include \
 	$(PWD)/bionic \
 	$(PWD)/external/stlport/stlport
diff --git a/libsrtp.target.linux-arm64.mk b/libsrtp.target.linux-arm64.mk
index eb797e7..ca51ff0 100644
--- a/libsrtp.target.linux-arm64.mk
+++ b/libsrtp.target.linux-arm64.mk
@@ -107,6 +107,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' \
@@ -136,6 +137,7 @@ LOCAL_C_INCLUDES_Debug := \
 	$(LOCAL_PATH)/third_party/libsrtp/config \
 	$(LOCAL_PATH)/third_party/libsrtp/srtp/include \
 	$(LOCAL_PATH)/third_party/libsrtp/srtp/crypto/include \
+	$(gyp_shared_intermediate_dir) \
 	$(PWD)/frameworks/wilhelm/include \
 	$(PWD)/bionic \
 	$(PWD)/external/stlport/stlport
@@ -210,6 +212,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' \
@@ -239,6 +242,7 @@ LOCAL_C_INCLUDES_Release := \
 	$(LOCAL_PATH)/third_party/libsrtp/config \
 	$(LOCAL_PATH)/third_party/libsrtp/srtp/include \
 	$(LOCAL_PATH)/third_party/libsrtp/srtp/crypto/include \
+	$(gyp_shared_intermediate_dir) \
 	$(PWD)/frameworks/wilhelm/include \
 	$(PWD)/bionic \
 	$(PWD)/external/stlport/stlport
diff --git a/libsrtp.target.linux-mips.mk b/libsrtp.target.linux-mips.mk
index 8b7766e..16f180c 100644
--- a/libsrtp.target.linux-mips.mk
+++ b/libsrtp.target.linux-mips.mk
@@ -112,6 +112,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' \
@@ -141,6 +142,7 @@ LOCAL_C_INCLUDES_Debug := \
 	$(LOCAL_PATH)/third_party/libsrtp/config \
 	$(LOCAL_PATH)/third_party/libsrtp/srtp/include \
 	$(LOCAL_PATH)/third_party/libsrtp/srtp/crypto/include \
+	$(gyp_shared_intermediate_dir) \
 	$(PWD)/frameworks/wilhelm/include \
 	$(PWD)/bionic \
 	$(PWD)/external/stlport/stlport
@@ -221,6 +223,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' \
@@ -250,6 +253,7 @@ LOCAL_C_INCLUDES_Release := \
 	$(LOCAL_PATH)/third_party/libsrtp/config \
 	$(LOCAL_PATH)/third_party/libsrtp/srtp/include \
 	$(LOCAL_PATH)/third_party/libsrtp/srtp/crypto/include \
+	$(gyp_shared_intermediate_dir) \
 	$(PWD)/frameworks/wilhelm/include \
 	$(PWD)/bionic \
 	$(PWD)/external/stlport/stlport
diff --git a/libsrtp.target.linux-x86.mk b/libsrtp.target.linux-x86.mk
index 0bd1ef7..e3ec5c0 100644
--- a/libsrtp.target.linux-x86.mk
+++ b/libsrtp.target.linux-x86.mk
@@ -112,6 +112,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' \
@@ -141,6 +142,7 @@ LOCAL_C_INCLUDES_Debug := \
 	$(LOCAL_PATH)/third_party/libsrtp/config \
 	$(LOCAL_PATH)/third_party/libsrtp/srtp/include \
 	$(LOCAL_PATH)/third_party/libsrtp/srtp/crypto/include \
+	$(gyp_shared_intermediate_dir) \
 	$(PWD)/frameworks/wilhelm/include \
 	$(PWD)/bionic \
 	$(PWD)/external/stlport/stlport
@@ -220,6 +222,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' \
@@ -249,6 +252,7 @@ LOCAL_C_INCLUDES_Release := \
 	$(LOCAL_PATH)/third_party/libsrtp/config \
 	$(LOCAL_PATH)/third_party/libsrtp/srtp/include \
 	$(LOCAL_PATH)/third_party/libsrtp/srtp/crypto/include \
+	$(gyp_shared_intermediate_dir) \
 	$(PWD)/frameworks/wilhelm/include \
 	$(PWD)/bionic \
 	$(PWD)/external/stlport/stlport
diff --git a/libsrtp.target.linux-x86_64.mk b/libsrtp.target.linux-x86_64.mk
index 4bd1ace..18aa79b 100644
--- a/libsrtp.target.linux-x86_64.mk
+++ b/libsrtp.target.linux-x86_64.mk
@@ -111,6 +111,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' \
@@ -140,6 +141,7 @@ LOCAL_C_INCLUDES_Debug := \
 	$(LOCAL_PATH)/third_party/libsrtp/config \
 	$(LOCAL_PATH)/third_party/libsrtp/srtp/include \
 	$(LOCAL_PATH)/third_party/libsrtp/srtp/crypto/include \
+	$(gyp_shared_intermediate_dir) \
 	$(PWD)/frameworks/wilhelm/include \
 	$(PWD)/bionic \
 	$(PWD)/external/stlport/stlport
@@ -218,6 +220,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' \
@@ -247,6 +250,7 @@ LOCAL_C_INCLUDES_Release := \
 	$(LOCAL_PATH)/third_party/libsrtp/config \
 	$(LOCAL_PATH)/third_party/libsrtp/srtp/include \
 	$(LOCAL_PATH)/third_party/libsrtp/srtp/crypto/include \
+	$(gyp_shared_intermediate_dir) \
 	$(PWD)/frameworks/wilhelm/include \
 	$(PWD)/bionic \
 	$(PWD)/external/stlport/stlport