Merge from Chromium at DEPS revision 278205
This commit was generated by merge_to_master.py.
Change-Id: I23f1e7ea8c154ba72e7fb594436216f861f868ab
diff --git a/net/net.target.darwin-mips.mk b/net/net.target.darwin-mips.mk
index 5f47fb2..d2d26e8 100644
--- a/net/net.target.darwin-mips.mk
+++ b/net/net.target.darwin-mips.mk
@@ -566,6 +566,7 @@
'-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' \
@@ -601,13 +602,13 @@
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/openssl \
$(LOCAL_PATH) \
$(LOCAL_PATH)/sdch/open-vcdiff/src \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
$(LOCAL_PATH)/third_party/zlib \
- $(gyp_shared_intermediate_dir) \
$(gyp_shared_intermediate_dir)/net \
$(LOCAL_PATH)/third_party/openssl/openssl/include \
$(PWD)/frameworks/wilhelm/include \
@@ -671,6 +672,7 @@
'-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' \
@@ -707,13 +709,13 @@
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/openssl \
$(LOCAL_PATH) \
$(LOCAL_PATH)/sdch/open-vcdiff/src \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
$(LOCAL_PATH)/third_party/zlib \
- $(gyp_shared_intermediate_dir) \
$(gyp_shared_intermediate_dir)/net \
$(LOCAL_PATH)/third_party/openssl/openssl/include \
$(PWD)/frameworks/wilhelm/include \