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

Side by Side Diff: media/BUILD.gn

Issue 474693002: Changes to media.gyp for Chromoting iOS client (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update gn as well Created 6 years, 4 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/base/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 289 matching lines...) Expand 10 before | Expand all | Expand 10 after
300 deps += [ 300 deps += [
301 "//media/base/android", 301 "//media/base/android",
302 "//media/base/android:media_jni_headers", 302 "//media/base/android:media_jni_headers",
303 "//media/base/android:video_capture_jni_headers", 303 "//media/base/android:video_capture_jni_headers",
304 ] 304 ]
305 if (!is_android_webview_build) { 305 if (!is_android_webview_build) {
306 deps += [ ":media_java" ] 306 deps += [ ":media_java" ]
307 } 307 }
308 } 308 }
309 309
310 if (!is_ios) {
311 deps += [ "//third_party/libyuv" ]
312 }
313
314 if (use_alsa) { 310 if (use_alsa) {
315 libs += [ "asound" ] 311 libs += [ "asound" ]
316 defines += [ "USE_ALSA" ] 312 defines += [ "USE_ALSA" ]
317 sources += [ 313 sources += [
318 "midi/midi_manager_alsa.cc", 314 "midi/midi_manager_alsa.cc",
319 "midi/midi_manager_alsa.h", 315 "midi/midi_manager_alsa.h",
320 ] 316 ]
321 } 317 }
322 318
323 # A simple WebM encoder for animated avatars on ChromeOS. 319 # A simple WebM encoder for animated avatars on ChromeOS.
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
415 ":shared_memory_support", 411 ":shared_memory_support",
416 "//base", 412 "//base",
417 "//base:i18n", 413 "//base:i18n",
418 "//base/third_party/dynamic_annotations", 414 "//base/third_party/dynamic_annotations",
419 "//crypto", 415 "//crypto",
420 "//crypto:platform", # TODO(ajwong): This used to be provided by crypto.gyp via export_dependent_settings 416 "//crypto:platform", # TODO(ajwong): This used to be provided by crypto.gyp via export_dependent_settings
421 "//gpu/command_buffer/common", 417 "//gpu/command_buffer/common",
422 "//media/audio", 418 "//media/audio",
423 "//media/base", 419 "//media/base",
424 "//skia", 420 "//skia",
421 "//third_party/libyuv",
425 "//third_party/opus", 422 "//third_party/opus",
426 "//ui/events:events_base", 423 "//ui/events:events_base",
427 "//ui/gfx", 424 "//ui/gfx",
428 "//ui/gfx/geometry", 425 "//ui/gfx/geometry",
429 "//url", 426 "//url",
430 ] 427 ]
431 } 428 }
432 429
433 test("media_unittests") { 430 test("media_unittests") {
434 sources = [ 431 sources = [
(...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after
740 java_cpp_template("media_android_imageformat_list") { 737 java_cpp_template("media_android_imageformat_list") {
741 sources = [ 738 sources = [
742 "base/android/java/src/org/chromium/media/ImageFormat.template", 739 "base/android/java/src/org/chromium/media/ImageFormat.template",
743 ] 740 ]
744 inputs = [ 741 inputs = [
745 "video/capture/android/imageformat_list.h" 742 "video/capture/android/imageformat_list.h"
746 ] 743 ]
747 package_name = "org/chromium/media" 744 package_name = "org/chromium/media"
748 } 745 }
749 } 746 }
OLDNEW
« no previous file with comments | « no previous file | media/base/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698