summaryrefslogtreecommitdiffstats
path: root/third_party/opus
diff options
context:
space:
mode:
authorslan <slan@chromium.org>2016-02-04 07:55:51 -0800
committerCommit bot <commit-bot@chromium.org>2016-02-04 15:57:06 +0000
commitcc100bfcf2f6b78ca4ef5a29c6a1f3e6da2ea590 (patch)
treee3149db513fc5ac62ce969b2730eb66fca1e74a8 /third_party/opus
parentbb588007222fe534c0580100ec503d313b7ed493 (diff)
downloadchromium_src-cc100bfcf2f6b78ca4ef5a29c6a1f3e6da2ea590.zip
chromium_src-cc100bfcf2f6b78ca4ef5a29c6a1f3e6da2ea590.tar.gz
chromium_src-cc100bfcf2f6b78ca4ef5a29c6a1f3e6da2ea590.tar.bz2
[BuildFix] cflags should be appended in //third_party/opus.
This error was causing breakage for internal Chromecast builds for ARM devices. Bug: b/26963221 BUG=None Review URL: https://codereview.chromium.org/1664483004 Cr-Commit-Position: refs/heads/master@{#373542}
Diffstat (limited to 'third_party/opus')
-rw-r--r--third_party/opus/BUILD.gn7
1 files changed, 4 insertions, 3 deletions
diff --git a/third_party/opus/BUILD.gn b/third_party/opus/BUILD.gn
index 4579469..19da82d 100644
--- a/third_party/opus/BUILD.gn
+++ b/third_party/opus/BUILD.gn
@@ -88,6 +88,7 @@ source_set("opus") {
":opus_warnings",
]
public_configs = [ ":opus_config" ]
+ cflags = []
if (is_win) {
defines += [
@@ -95,7 +96,7 @@ source_set("opus") {
"inline=__inline",
]
- cflags = [
+ cflags += [
"/wd4305", # Disable truncation warning in celt/pitch.c .
"/wd4334", # Disable 32-bit shift warning in src/opus_encoder.c .
]
@@ -110,7 +111,7 @@ source_set("opus") {
if (is_posix && !is_android) {
# Suppress a warning given by opus_decoder.c that tells us
# optimizations are turned off.
- cflags = [ "-Wno-#pragma-messages" ]
+ cflags += [ "-Wno-#pragma-messages" ]
}
if (!is_debug && is_posix &&
@@ -175,7 +176,7 @@ source_set("opus") {
]
configs -= [ "//build/config/compiler:compiler_arm_fpu" ]
- cflags = [ "-mfpu=neon" ]
+ cflags += [ "-mfpu=neon" ]
}
}
}