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

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

Issue 1140553004: Fixed media build on iOS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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 | « no previous file | media/media.gyp » ('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/features.gni") 7 import("//build/config/features.gni")
8 import("//build/config/ui.gni") 8 import("//build/config/ui.gni")
9 import("//build/config/linux/pkg_config.gni") 9 import("//build/config/linux/pkg_config.gni")
10 import("//media/media_options.gni") 10 import("//media/media_options.gni")
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
261 sources += [ "user_input_monitor_mac.cc" ] 261 sources += [ "user_input_monitor_mac.cc" ]
262 262
263 # Required by video_frame.cc. 263 # Required by video_frame.cc.
264 libs = [ "CoreVideo.framework" ] 264 libs = [ "CoreVideo.framework" ]
265 } else if (is_win) { 265 } else if (is_win) {
266 sources += [ "user_input_monitor_win.cc" ] 266 sources += [ "user_input_monitor_win.cc" ]
267 } else { 267 } else {
268 defines += [ "DISABLE_USER_INPUT_MONITOR" ] 268 defines += [ "DISABLE_USER_INPUT_MONITOR" ]
269 } 269 }
270 270
271 if (current_cpu == "x86" || current_cpu == "x64") { 271 if (!is_ios && (current_cpu == "x86" || current_cpu == "x64")) {
272 sources += [ "simd/convert_yuv_to_rgb_x86.cc" ] 272 sources += [ "simd/convert_yuv_to_rgb_x86.cc" ]
273 deps += [ 273 deps += [
274 ":media_yasm", 274 ":media_yasm",
275 ":media_sse2", 275 ":media_sse2",
276 ] 276 ]
277 } 277 }
278 278
279 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] 279 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
280 280
281 if (is_linux || is_win) { 281 if (is_linux || is_win) {
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after
525 if (is_posix) { 525 if (is_posix) {
526 yasm_flags += [ "-DELF" ] 526 yasm_flags += [ "-DELF" ]
527 if (current_cpu == "x64") { 527 if (current_cpu == "x64") {
528 # TODO(ajwong): Why isn't this true in mac? 528 # TODO(ajwong): Why isn't this true in mac?
529 yasm_flags += [ "-DPIC" ] 529 yasm_flags += [ "-DPIC" ]
530 } 530 }
531 } 531 }
532 } 532 }
533 } 533 }
534 } 534 }
OLDNEW
« no previous file with comments | « no previous file | media/media.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698