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}
32 lines
1005 B
Plaintext
32 lines
1005 B
Plaintext
# Copyright (c) 2016 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")
|
|
|
|
audio_codec_defines = []
|
|
if (rtc_include_ilbc) {
|
|
audio_codec_defines += [ "WEBRTC_CODEC_ILBC" ]
|
|
}
|
|
if (rtc_include_opus) {
|
|
audio_codec_defines += [ "WEBRTC_CODEC_OPUS" ]
|
|
}
|
|
if (!build_with_mozilla) {
|
|
if (current_cpu == "arm") {
|
|
audio_codec_defines += [ "WEBRTC_CODEC_ISACFX" ]
|
|
} else {
|
|
audio_codec_defines += [ "WEBRTC_CODEC_ISAC" ]
|
|
}
|
|
audio_codec_defines += [ "WEBRTC_CODEC_G722" ]
|
|
}
|
|
if (!build_with_mozilla && !build_with_chromium) {
|
|
audio_codec_defines += [ "WEBRTC_CODEC_RED" ]
|
|
}
|
|
|
|
audio_coding_defines = audio_codec_defines
|
|
neteq_defines = audio_codec_defines
|