diff options
| author | dpranke <dpranke@chromium.org> | 2015-02-19 18:55:19 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-20 02:56:07 +0000 |
| commit | 4327621a322c964a8bc6d1ef5a4534f0f877d63e (patch) | |
| tree | eb4397f38579a5d7dcb821a8873e4006187dd450 /third_party/opus/BUILD.gn | |
| parent | 05b60060481868d9d6892f05e25e33e7934d1284 (diff) | |
| download | chromium_src-4327621a322c964a8bc6d1ef5a4534f0f877d63e.zip chromium_src-4327621a322c964a8bc6d1ef5a4534f0f877d63e.tar.gz chromium_src-4327621a322c964a8bc6d1ef5a4534f0f877d63e.tar.bz2 | |
Update Chomium's build files to work w/ latest GN binaries.
The latest GN binaries rename cpu_arch to current_cpu and/or target_cpu
as appropriate, build_cpu_arch to host_cpu, and os to current_os and target_os as appropriate.
R=brettw@chromium.org
TBR=ddorwin@chromium.org
EXTRA_TRYBOTS=tryserver.chromium.linux:android_chromium_gn_compile_dbg,android_chromium_gn_compile_rel;tryserver.chromium.win:win8_chromium_gn_rel,win8_chromium_gn_dbg;tryserver.chromium.mac:mac_chromium_gn_rel,mac_chromium_gn_dbg
BUG=344767
Review URL: https://codereview.chromium.org/913373002
Cr-Commit-Position: refs/heads/master@{#317223}
Diffstat (limited to 'third_party/opus/BUILD.gn')
| -rw-r--r-- | third_party/opus/BUILD.gn | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/third_party/opus/BUILD.gn b/third_party/opus/BUILD.gn index 244ddcd..fefba04 100644 --- a/third_party/opus/BUILD.gn +++ b/third_party/opus/BUILD.gn @@ -6,15 +6,15 @@ import("//build/config/arm.gni") import("//testing/test.gni") # If fixed point implementation shall be used (otherwise float). -use_opus_fixed_point = cpu_arch == "arm" || cpu_arch == "arm64" +use_opus_fixed_point = current_cpu == "arm" || current_cpu == "arm64" # If ARM optimizations shall be used to accelerate performance. -use_opus_arm_optimization = cpu_arch == "arm" +use_opus_arm_optimization = current_cpu == "arm" # If OPUS Run Time CPU Detections (RTCD) shall be used. # Based on the conditions in celt/arm/armcpu.c: # defined(_MSC_VER) || defined(__linux__). -use_opus_rtcd = cpu_arch == "arm" && (is_win || is_android || is_linux) +use_opus_rtcd = current_cpu == "arm" && (is_win || is_android || is_linux) config("opus_config") { include_dirs = [ "src/include" ] @@ -97,7 +97,8 @@ source_set("opus") { cflags = [ "-Wno-#pragma-messages" ] } - if (!is_debug && is_posix && (cpu_arch == "arm" || cpu_arch == "arm64")) { + if (!is_debug && is_posix && + (current_cpu == "arm" || current_cpu == "arm64")) { configs -= [ "//build/config/compiler:optimize" ] configs += [ "//build/config/compiler:optimize_max" ] } |