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

Side by Side Diff: media/base/BUILD.gn

Issue 1089773003: Revert of Fix errors found in Mac gn component builds (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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 unified diff | Download patch
« no previous file with comments | « media/BUILD.gn ('k') | media/base/mac/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/config/android/config.gni") 5 import("//build/config/android/config.gni")
6 import("//build/config/arm.gni") 6 import("//build/config/arm.gni")
7 import("//build/config/ui.gni") 7 import("//build/config/ui.gni")
8 import("//build/config/linux/pkg_config.gni") 8 import("//build/config/linux/pkg_config.gni")
9 import("//media/media_options.gni") 9 import("//media/media_options.gni")
10 10
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 # "//build/config/linux:xfixes", 234 # "//build/config/linux:xfixes",
235 # "//build/config/linux:xtst", 235 # "//build/config/linux:xtst",
236 ] 236 ]
237 sources += [ "user_input_monitor_linux.cc" ] 237 sources += [ "user_input_monitor_linux.cc" ]
238 deps += [ 238 deps += [
239 "//ui/events:events_base", 239 "//ui/events:events_base",
240 "//ui/gfx/x", 240 "//ui/gfx/x",
241 ] 241 ]
242 } else if (is_mac) { 242 } else if (is_mac) {
243 sources += [ "user_input_monitor_mac.cc" ] 243 sources += [ "user_input_monitor_mac.cc" ]
244
245 # Required by video_frame.cc.
246 libs = [
247 "CoreVideo.framework"
248 ]
249 } else if (is_win) { 244 } else if (is_win) {
250 sources += [ "user_input_monitor_win.cc" ] 245 sources += [ "user_input_monitor_win.cc" ]
251 } else { 246 } else {
252 defines += [ "DISABLE_USER_INPUT_MONITOR" ] 247 defines += [ "DISABLE_USER_INPUT_MONITOR" ]
253 } 248 }
254 249
255 if (current_cpu == "x86" || current_cpu == "x64") { 250 if (current_cpu == "x86" || current_cpu == "x64") {
256 sources += [ "simd/convert_yuv_to_rgb_x86.cc" ] 251 sources += [ "simd/convert_yuv_to_rgb_x86.cc" ]
257 deps += [ 252 deps += [
258 ":media_yasm", 253 ":media_yasm",
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
500 if (is_posix) { 495 if (is_posix) {
501 yasm_flags += [ "-DELF" ] 496 yasm_flags += [ "-DELF" ]
502 if (current_cpu == "x64") { 497 if (current_cpu == "x64") {
503 # TODO(ajwong): Why isn't this true in mac? 498 # TODO(ajwong): Why isn't this true in mac?
504 yasm_flags += [ "-DPIC" ] 499 yasm_flags += [ "-DPIC" ]
505 } 500 }
506 } 501 }
507 } 502 }
508 } 503 }
509 } 504 }
OLDNEW
« no previous file with comments | « media/BUILD.gn ('k') | media/base/mac/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698