Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(680)

Unified Diff: media/base/BUILD.gn

Issue 913373002: Update Chomium's build files to work w/ latest GN binaries. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gn_cpu_arch_changes
Patch Set: cleanup / review Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/BUILD.gn ('k') | mojo/nacl/BUILD.gn » ('j') | ppapi/BUILD.gn » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/BUILD.gn
diff --git a/media/base/BUILD.gn b/media/base/BUILD.gn
index fd1bfe0263cfc94e608cf2ae831bb415fecf1c99..bce587b6718310c7151723795867bb8c1f46979f 100644
--- a/media/base/BUILD.gn
+++ b/media/base/BUILD.gn
@@ -240,7 +240,7 @@ source_set("base") {
defines += [ "DISABLE_USER_INPUT_MONITOR" ]
}
- if (cpu_arch == "x86" || cpu_arch == "x64") {
+ if (current_cpu == "x86" || current_cpu == "x64") {
sources += [ "simd/convert_yuv_to_rgb_x86.cc" ]
deps += [
":media_yasm",
@@ -370,7 +370,7 @@ source_set("unittests") {
deps += [ "//ui/gl" ]
}
- if (cpu_arch == "x86" || cpu_arch == "x64") {
+ if (current_cpu == "x86" || current_cpu == "x64") {
sources += [ "simd/convert_rgb_to_yuv_unittest.cc" ]
}
}
@@ -402,7 +402,7 @@ source_set("perftests") {
}
}
-if (cpu_arch == "x86" || cpu_arch == "x64") {
+if (current_cpu == "x86" || current_cpu == "x64") {
source_set("media_sse2") {
sources = [
"simd/convert_rgb_to_yuv_sse2.cc",
@@ -449,9 +449,9 @@ if (cpu_arch == "x86" || cpu_arch == "x64") {
"simd/scale_yuv_to_rgb_mmx.inc",
]
- if (cpu_arch == "x86") {
+ if (current_cpu == "x86") {
yasm_flags += [ "-DARCH_X86_32" ]
- } else if (cpu_arch == "x64") {
+ } else if (current_cpu == "x64") {
yasm_flags += [ "-DARCH_X86_64" ]
sources += [
"simd/linear_scale_yuv_to_rgb_mmx_x64.asm",
@@ -467,7 +467,7 @@ if (cpu_arch == "x86" || cpu_arch == "x64") {
} else {
if (is_posix) {
yasm_flags += [ "-DELF" ]
- if (cpu_arch == "x64") {
+ if (current_cpu == "x64") {
# TODO(ajwong): Why isn't this true in mac?
yasm_flags += [ "-DPIC" ]
}
« no previous file with comments | « media/BUILD.gn ('k') | mojo/nacl/BUILD.gn » ('j') | ppapi/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698