diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-06-16 19:56:12 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-06-16 19:56:12 +0000 |
| commit | 5c28a0a23c4b04c44d7b1a5db4903f4e5ee18ff9 (patch) | |
| tree | 5aba0029ac49fdf212192629e87811c97d9be9b5 | |
| parent | e5a0f268d1df9a80a5db4fa764c4f92b713a03ec (diff) | |
| download | webrtc-5c28a0a23c4b04c44d7b1a5db4903f4e5ee18ff9.tar.gz | |
Update makefiles after merge of Chromium at 277521
This commit was generated by merge_from_chromium.py.
Change-Id: I5e2487610f17d8a9d3ac7705201232981d75caf3
| -rw-r--r-- | base/webrtc_base.target.darwin-arm.mk | 1 | ||||
| -rw-r--r-- | base/webrtc_base.target.darwin-arm64.mk | 1 | ||||
| -rw-r--r-- | base/webrtc_base.target.darwin-mips.mk | 1 | ||||
| -rw-r--r-- | base/webrtc_base.target.darwin-x86.mk | 1 | ||||
| -rw-r--r-- | base/webrtc_base.target.darwin-x86_64.mk | 1 | ||||
| -rw-r--r-- | base/webrtc_base.target.linux-arm.mk | 1 | ||||
| -rw-r--r-- | base/webrtc_base.target.linux-arm64.mk | 1 | ||||
| -rw-r--r-- | base/webrtc_base.target.linux-mips.mk | 1 | ||||
| -rw-r--r-- | base/webrtc_base.target.linux-x86.mk | 1 | ||||
| -rw-r--r-- | base/webrtc_base.target.linux-x86_64.mk | 1 | ||||
| -rw-r--r-- | modules/audio_processing_neon.target.darwin-arm.mk | 1 | ||||
| -rw-r--r-- | modules/audio_processing_neon.target.linux-arm.mk | 1 |
12 files changed, 12 insertions, 0 deletions
diff --git a/base/webrtc_base.target.darwin-arm.mk b/base/webrtc_base.target.darwin-arm.mk index 72b07fdf..67e9aac6 100644 --- a/base/webrtc_base.target.darwin-arm.mk +++ b/base/webrtc_base.target.darwin-arm.mk @@ -88,6 +88,7 @@ LOCAL_SRC_FILES := \ third_party/webrtc/base/taskparent.cc \ third_party/webrtc/base/taskrunner.cc \ third_party/webrtc/base/thread.cc \ + third_party/webrtc/base/thread_checker_impl.cc \ third_party/webrtc/base/timeutils.cc \ third_party/webrtc/base/timing.cc \ third_party/webrtc/base/unixfilesystem.cc \ diff --git a/base/webrtc_base.target.darwin-arm64.mk b/base/webrtc_base.target.darwin-arm64.mk index 49da5068..be752dda 100644 --- a/base/webrtc_base.target.darwin-arm64.mk +++ b/base/webrtc_base.target.darwin-arm64.mk @@ -88,6 +88,7 @@ LOCAL_SRC_FILES := \ third_party/webrtc/base/taskparent.cc \ third_party/webrtc/base/taskrunner.cc \ third_party/webrtc/base/thread.cc \ + third_party/webrtc/base/thread_checker_impl.cc \ third_party/webrtc/base/timeutils.cc \ third_party/webrtc/base/timing.cc \ third_party/webrtc/base/unixfilesystem.cc \ diff --git a/base/webrtc_base.target.darwin-mips.mk b/base/webrtc_base.target.darwin-mips.mk index 524d9240..7af2891f 100644 --- a/base/webrtc_base.target.darwin-mips.mk +++ b/base/webrtc_base.target.darwin-mips.mk @@ -88,6 +88,7 @@ LOCAL_SRC_FILES := \ third_party/webrtc/base/taskparent.cc \ third_party/webrtc/base/taskrunner.cc \ third_party/webrtc/base/thread.cc \ + third_party/webrtc/base/thread_checker_impl.cc \ third_party/webrtc/base/timeutils.cc \ third_party/webrtc/base/timing.cc \ third_party/webrtc/base/unixfilesystem.cc \ diff --git a/base/webrtc_base.target.darwin-x86.mk b/base/webrtc_base.target.darwin-x86.mk index 7c3e0c87..b2b01316 100644 --- a/base/webrtc_base.target.darwin-x86.mk +++ b/base/webrtc_base.target.darwin-x86.mk @@ -88,6 +88,7 @@ LOCAL_SRC_FILES := \ third_party/webrtc/base/taskparent.cc \ third_party/webrtc/base/taskrunner.cc \ third_party/webrtc/base/thread.cc \ + third_party/webrtc/base/thread_checker_impl.cc \ third_party/webrtc/base/timeutils.cc \ third_party/webrtc/base/timing.cc \ third_party/webrtc/base/unixfilesystem.cc \ diff --git a/base/webrtc_base.target.darwin-x86_64.mk b/base/webrtc_base.target.darwin-x86_64.mk index 4bef0ea6..a7a2c7d8 100644 --- a/base/webrtc_base.target.darwin-x86_64.mk +++ b/base/webrtc_base.target.darwin-x86_64.mk @@ -88,6 +88,7 @@ LOCAL_SRC_FILES := \ third_party/webrtc/base/taskparent.cc \ third_party/webrtc/base/taskrunner.cc \ third_party/webrtc/base/thread.cc \ + third_party/webrtc/base/thread_checker_impl.cc \ third_party/webrtc/base/timeutils.cc \ third_party/webrtc/base/timing.cc \ third_party/webrtc/base/unixfilesystem.cc \ diff --git a/base/webrtc_base.target.linux-arm.mk b/base/webrtc_base.target.linux-arm.mk index 72b07fdf..67e9aac6 100644 --- a/base/webrtc_base.target.linux-arm.mk +++ b/base/webrtc_base.target.linux-arm.mk @@ -88,6 +88,7 @@ LOCAL_SRC_FILES := \ third_party/webrtc/base/taskparent.cc \ third_party/webrtc/base/taskrunner.cc \ third_party/webrtc/base/thread.cc \ + third_party/webrtc/base/thread_checker_impl.cc \ third_party/webrtc/base/timeutils.cc \ third_party/webrtc/base/timing.cc \ third_party/webrtc/base/unixfilesystem.cc \ diff --git a/base/webrtc_base.target.linux-arm64.mk b/base/webrtc_base.target.linux-arm64.mk index 49da5068..be752dda 100644 --- a/base/webrtc_base.target.linux-arm64.mk +++ b/base/webrtc_base.target.linux-arm64.mk @@ -88,6 +88,7 @@ LOCAL_SRC_FILES := \ third_party/webrtc/base/taskparent.cc \ third_party/webrtc/base/taskrunner.cc \ third_party/webrtc/base/thread.cc \ + third_party/webrtc/base/thread_checker_impl.cc \ third_party/webrtc/base/timeutils.cc \ third_party/webrtc/base/timing.cc \ third_party/webrtc/base/unixfilesystem.cc \ diff --git a/base/webrtc_base.target.linux-mips.mk b/base/webrtc_base.target.linux-mips.mk index 524d9240..7af2891f 100644 --- a/base/webrtc_base.target.linux-mips.mk +++ b/base/webrtc_base.target.linux-mips.mk @@ -88,6 +88,7 @@ LOCAL_SRC_FILES := \ third_party/webrtc/base/taskparent.cc \ third_party/webrtc/base/taskrunner.cc \ third_party/webrtc/base/thread.cc \ + third_party/webrtc/base/thread_checker_impl.cc \ third_party/webrtc/base/timeutils.cc \ third_party/webrtc/base/timing.cc \ third_party/webrtc/base/unixfilesystem.cc \ diff --git a/base/webrtc_base.target.linux-x86.mk b/base/webrtc_base.target.linux-x86.mk index 7c3e0c87..b2b01316 100644 --- a/base/webrtc_base.target.linux-x86.mk +++ b/base/webrtc_base.target.linux-x86.mk @@ -88,6 +88,7 @@ LOCAL_SRC_FILES := \ third_party/webrtc/base/taskparent.cc \ third_party/webrtc/base/taskrunner.cc \ third_party/webrtc/base/thread.cc \ + third_party/webrtc/base/thread_checker_impl.cc \ third_party/webrtc/base/timeutils.cc \ third_party/webrtc/base/timing.cc \ third_party/webrtc/base/unixfilesystem.cc \ diff --git a/base/webrtc_base.target.linux-x86_64.mk b/base/webrtc_base.target.linux-x86_64.mk index 4bef0ea6..a7a2c7d8 100644 --- a/base/webrtc_base.target.linux-x86_64.mk +++ b/base/webrtc_base.target.linux-x86_64.mk @@ -88,6 +88,7 @@ LOCAL_SRC_FILES := \ third_party/webrtc/base/taskparent.cc \ third_party/webrtc/base/taskrunner.cc \ third_party/webrtc/base/thread.cc \ + third_party/webrtc/base/thread_checker_impl.cc \ third_party/webrtc/base/timeutils.cc \ third_party/webrtc/base/timing.cc \ third_party/webrtc/base/unixfilesystem.cc \ diff --git a/modules/audio_processing_neon.target.darwin-arm.mk b/modules/audio_processing_neon.target.darwin-arm.mk index 5128a74c..483350ad 100644 --- a/modules/audio_processing_neon.target.darwin-arm.mk +++ b/modules/audio_processing_neon.target.darwin-arm.mk @@ -26,6 +26,7 @@ LOCAL_GENERATED_SOURCES := GYP_COPIED_SOURCE_ORIGIN_DIRS := LOCAL_SRC_FILES := \ + third_party/webrtc/modules/audio_processing/aec/aec_core_neon.c \ third_party/webrtc/modules/audio_processing/aecm/aecm_core_neon.S \ third_party/webrtc/modules/audio_processing/ns/nsx_core_neon.S diff --git a/modules/audio_processing_neon.target.linux-arm.mk b/modules/audio_processing_neon.target.linux-arm.mk index 5128a74c..483350ad 100644 --- a/modules/audio_processing_neon.target.linux-arm.mk +++ b/modules/audio_processing_neon.target.linux-arm.mk @@ -26,6 +26,7 @@ LOCAL_GENERATED_SOURCES := GYP_COPIED_SOURCE_ORIGIN_DIRS := LOCAL_SRC_FILES := \ + third_party/webrtc/modules/audio_processing/aec/aec_core_neon.c \ third_party/webrtc/modules/audio_processing/aecm/aecm_core_neon.S \ third_party/webrtc/modules/audio_processing/ns/nsx_core_neon.S |