9aa3f0a200
Reason for revert: Starting to work on a fix (it seems that there are third_party dependencies that depends on the path to the webrtc.gni file) Original issue's description: > Revert of Moving webrtc.gni up one level from build/ (patchset #1 id:1 of https://codereview.webrtc.org/2651543003/ ) > > Reason for revert: > This was causing the following failure: https://build.chromium.org/p/chromium.webrtc.fyi/builders/Android%20Builder/builds/838/steps/generate_build_files/logs/stdio > > Original issue's description: > > Moving webrtc.gni up one level from build/ > > > > BUG=webrtc:7030 > > > > Review-Url: https://codereview.webrtc.org/2651543003 > > Cr-Commit-Position: refs/heads/master@{#16241} > > Committed:35a32700fc> > TBR=kjellander@webrtc.org > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=webrtc:7030 > > Review-Url: https://codereview.webrtc.org/2657563002 > Cr-Commit-Position: refs/heads/master@{#16244} > Committed:69dc7dbe24TBR=kjellander@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:7030 Review-Url: https://codereview.webrtc.org/2654773002 Cr-Commit-Position: refs/heads/master@{#16247}
73 lines
2.1 KiB
Plaintext
73 lines
2.1 KiB
Plaintext
# Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
|
|
#
|
|
# Use of this source code is governed by a BSD-style license
|
|
# that can be found in the LICENSE file in the root of the source
|
|
# tree. An additional intellectual property rights grant can be found
|
|
# in the file PATENTS. All contributing project authors may
|
|
# be found in the AUTHORS file in the root of the source tree.
|
|
|
|
import("../../webrtc.gni")
|
|
|
|
config("audio_conference_mixer_config") {
|
|
visibility = [ ":*" ] # Only targets in this file can depend on this.
|
|
include_dirs = [
|
|
"include",
|
|
"../include",
|
|
]
|
|
}
|
|
|
|
rtc_static_library("audio_conference_mixer") {
|
|
sources = [
|
|
"include/audio_conference_mixer.h",
|
|
"include/audio_conference_mixer_defines.h",
|
|
"source/audio_conference_mixer_impl.cc",
|
|
"source/audio_conference_mixer_impl.h",
|
|
"source/audio_frame_manipulator.cc",
|
|
"source/audio_frame_manipulator.h",
|
|
"source/memory_pool.h",
|
|
"source/memory_pool_posix.h",
|
|
"source/memory_pool_win.h",
|
|
"source/time_scheduler.cc",
|
|
"source/time_scheduler.h",
|
|
]
|
|
|
|
public_configs = [ ":audio_conference_mixer_config" ]
|
|
|
|
if (!build_with_chromium && is_clang) {
|
|
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
|
|
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
|
|
}
|
|
|
|
deps = [
|
|
"../..:webrtc_common",
|
|
"../../audio/utility:audio_frame_operations",
|
|
"../../base:rtc_base_approved",
|
|
"../../system_wrappers",
|
|
"../audio_processing",
|
|
]
|
|
}
|
|
|
|
if (rtc_include_tests) {
|
|
rtc_source_set("audio_conference_mixer_unittests") {
|
|
testonly = true
|
|
sources = [
|
|
"test/audio_conference_mixer_unittest.cc",
|
|
]
|
|
deps = [
|
|
":audio_conference_mixer",
|
|
"../../test:test_support",
|
|
"//testing/gmock",
|
|
]
|
|
if (is_win) {
|
|
cflags = [
|
|
# TODO(kjellander): bugs.webrtc.org/261: Fix this warning.
|
|
"/wd4373", # virtual function override.
|
|
]
|
|
}
|
|
if (!build_with_chromium && is_clang) {
|
|
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
|
|
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
|
|
}
|
|
}
|
|
}
|