summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2014-10-29 14:43:41 +0000
committerBen Murdoch <benm@google.com>2014-10-29 14:43:41 +0000
commit63ea54f0e08983c20b01e79d2e58827747360dc3 (patch)
treee8be150d535758059215a68eda79d7eda8ea9bed
parent0cf17964c0297044340a659477770e3420e6a4ed (diff)
downloadwebrtc-63ea54f0e08983c20b01e79d2e58827747360dc3.tar.gz
Update makefiles after merge of Chromium at 39.0.2171.44
This commit was generated by merge_from_chromium.py. Change-Id: I5c3566d504f0e795ef5518262dfd5148387a68d3
-rw-r--r--base/rtc_base_approved.target.darwin-arm.mk1
-rw-r--r--base/rtc_base_approved.target.darwin-arm64.mk1
-rw-r--r--base/rtc_base_approved.target.darwin-mips.mk1
-rw-r--r--base/rtc_base_approved.target.darwin-x86.mk1
-rw-r--r--base/rtc_base_approved.target.darwin-x86_64.mk1
-rw-r--r--base/rtc_base_approved.target.linux-arm.mk1
-rw-r--r--base/rtc_base_approved.target.linux-arm64.mk1
-rw-r--r--base/rtc_base_approved.target.linux-mips.mk1
-rw-r--r--base/rtc_base_approved.target.linux-x86.mk1
-rw-r--r--base/rtc_base_approved.target.linux-x86_64.mk1
10 files changed, 10 insertions, 0 deletions
diff --git a/base/rtc_base_approved.target.darwin-arm.mk b/base/rtc_base_approved.target.darwin-arm.mk
index 192b17a7..1bf90c08 100644
--- a/base/rtc_base_approved.target.darwin-arm.mk
+++ b/base/rtc_base_approved.target.darwin-arm.mk
@@ -26,6 +26,7 @@ LOCAL_SRC_FILES := \
third_party/webrtc/base/checks.cc \
third_party/webrtc/base/exp_filter.cc \
third_party/webrtc/base/md5.cc \
+ third_party/webrtc/base/platform_file.cc \
third_party/webrtc/base/stringencode.cc \
third_party/webrtc/base/stringutils.cc \
third_party/webrtc/base/timeutils.cc
diff --git a/base/rtc_base_approved.target.darwin-arm64.mk b/base/rtc_base_approved.target.darwin-arm64.mk
index 6cfd2645..26d24d03 100644
--- a/base/rtc_base_approved.target.darwin-arm64.mk
+++ b/base/rtc_base_approved.target.darwin-arm64.mk
@@ -26,6 +26,7 @@ LOCAL_SRC_FILES := \
third_party/webrtc/base/checks.cc \
third_party/webrtc/base/exp_filter.cc \
third_party/webrtc/base/md5.cc \
+ third_party/webrtc/base/platform_file.cc \
third_party/webrtc/base/stringencode.cc \
third_party/webrtc/base/stringutils.cc \
third_party/webrtc/base/timeutils.cc
diff --git a/base/rtc_base_approved.target.darwin-mips.mk b/base/rtc_base_approved.target.darwin-mips.mk
index b1c30e1c..21766d27 100644
--- a/base/rtc_base_approved.target.darwin-mips.mk
+++ b/base/rtc_base_approved.target.darwin-mips.mk
@@ -26,6 +26,7 @@ LOCAL_SRC_FILES := \
third_party/webrtc/base/checks.cc \
third_party/webrtc/base/exp_filter.cc \
third_party/webrtc/base/md5.cc \
+ third_party/webrtc/base/platform_file.cc \
third_party/webrtc/base/stringencode.cc \
third_party/webrtc/base/stringutils.cc \
third_party/webrtc/base/timeutils.cc
diff --git a/base/rtc_base_approved.target.darwin-x86.mk b/base/rtc_base_approved.target.darwin-x86.mk
index 3ab741ce..26a3dc5e 100644
--- a/base/rtc_base_approved.target.darwin-x86.mk
+++ b/base/rtc_base_approved.target.darwin-x86.mk
@@ -26,6 +26,7 @@ LOCAL_SRC_FILES := \
third_party/webrtc/base/checks.cc \
third_party/webrtc/base/exp_filter.cc \
third_party/webrtc/base/md5.cc \
+ third_party/webrtc/base/platform_file.cc \
third_party/webrtc/base/stringencode.cc \
third_party/webrtc/base/stringutils.cc \
third_party/webrtc/base/timeutils.cc
diff --git a/base/rtc_base_approved.target.darwin-x86_64.mk b/base/rtc_base_approved.target.darwin-x86_64.mk
index cf60501e..72806168 100644
--- a/base/rtc_base_approved.target.darwin-x86_64.mk
+++ b/base/rtc_base_approved.target.darwin-x86_64.mk
@@ -26,6 +26,7 @@ LOCAL_SRC_FILES := \
third_party/webrtc/base/checks.cc \
third_party/webrtc/base/exp_filter.cc \
third_party/webrtc/base/md5.cc \
+ third_party/webrtc/base/platform_file.cc \
third_party/webrtc/base/stringencode.cc \
third_party/webrtc/base/stringutils.cc \
third_party/webrtc/base/timeutils.cc
diff --git a/base/rtc_base_approved.target.linux-arm.mk b/base/rtc_base_approved.target.linux-arm.mk
index 192b17a7..1bf90c08 100644
--- a/base/rtc_base_approved.target.linux-arm.mk
+++ b/base/rtc_base_approved.target.linux-arm.mk
@@ -26,6 +26,7 @@ LOCAL_SRC_FILES := \
third_party/webrtc/base/checks.cc \
third_party/webrtc/base/exp_filter.cc \
third_party/webrtc/base/md5.cc \
+ third_party/webrtc/base/platform_file.cc \
third_party/webrtc/base/stringencode.cc \
third_party/webrtc/base/stringutils.cc \
third_party/webrtc/base/timeutils.cc
diff --git a/base/rtc_base_approved.target.linux-arm64.mk b/base/rtc_base_approved.target.linux-arm64.mk
index 6cfd2645..26d24d03 100644
--- a/base/rtc_base_approved.target.linux-arm64.mk
+++ b/base/rtc_base_approved.target.linux-arm64.mk
@@ -26,6 +26,7 @@ LOCAL_SRC_FILES := \
third_party/webrtc/base/checks.cc \
third_party/webrtc/base/exp_filter.cc \
third_party/webrtc/base/md5.cc \
+ third_party/webrtc/base/platform_file.cc \
third_party/webrtc/base/stringencode.cc \
third_party/webrtc/base/stringutils.cc \
third_party/webrtc/base/timeutils.cc
diff --git a/base/rtc_base_approved.target.linux-mips.mk b/base/rtc_base_approved.target.linux-mips.mk
index b1c30e1c..21766d27 100644
--- a/base/rtc_base_approved.target.linux-mips.mk
+++ b/base/rtc_base_approved.target.linux-mips.mk
@@ -26,6 +26,7 @@ LOCAL_SRC_FILES := \
third_party/webrtc/base/checks.cc \
third_party/webrtc/base/exp_filter.cc \
third_party/webrtc/base/md5.cc \
+ third_party/webrtc/base/platform_file.cc \
third_party/webrtc/base/stringencode.cc \
third_party/webrtc/base/stringutils.cc \
third_party/webrtc/base/timeutils.cc
diff --git a/base/rtc_base_approved.target.linux-x86.mk b/base/rtc_base_approved.target.linux-x86.mk
index 3ab741ce..26a3dc5e 100644
--- a/base/rtc_base_approved.target.linux-x86.mk
+++ b/base/rtc_base_approved.target.linux-x86.mk
@@ -26,6 +26,7 @@ LOCAL_SRC_FILES := \
third_party/webrtc/base/checks.cc \
third_party/webrtc/base/exp_filter.cc \
third_party/webrtc/base/md5.cc \
+ third_party/webrtc/base/platform_file.cc \
third_party/webrtc/base/stringencode.cc \
third_party/webrtc/base/stringutils.cc \
third_party/webrtc/base/timeutils.cc
diff --git a/base/rtc_base_approved.target.linux-x86_64.mk b/base/rtc_base_approved.target.linux-x86_64.mk
index cf60501e..72806168 100644
--- a/base/rtc_base_approved.target.linux-x86_64.mk
+++ b/base/rtc_base_approved.target.linux-x86_64.mk
@@ -26,6 +26,7 @@ LOCAL_SRC_FILES := \
third_party/webrtc/base/checks.cc \
third_party/webrtc/base/exp_filter.cc \
third_party/webrtc/base/md5.cc \
+ third_party/webrtc/base/platform_file.cc \
third_party/webrtc/base/stringencode.cc \
third_party/webrtc/base/stringutils.cc \
third_party/webrtc/base/timeutils.cc