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

Side by Side Diff: media/BUILD.gn

Issue 1048863002: Remove android_webview_build conditions from various places. (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 | « 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/linux/pkg_config.gni") 8 import("//build/config/linux/pkg_config.gni")
9 import("//build/config/ui.gni") 9 import("//build/config/ui.gni")
10 import("//media/media_options.gni") 10 import("//media/media_options.gni")
(...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 "midi/usb_midi_device_android.h", 336 "midi/usb_midi_device_android.h",
337 "midi/usb_midi_device_factory_android.cc", 337 "midi/usb_midi_device_factory_android.cc",
338 "midi/usb_midi_device_factory_android.h", 338 "midi/usb_midi_device_factory_android.h",
339 "video/capture/android/video_capture_device_android.cc", 339 "video/capture/android/video_capture_device_android.cc",
340 "video/capture/android/video_capture_device_android.h", 340 "video/capture/android/video_capture_device_android.h",
341 "video/capture/android/video_capture_device_factory_android.cc", 341 "video/capture/android/video_capture_device_factory_android.cc",
342 "video/capture/android/video_capture_device_factory_android.h", 342 "video/capture/android/video_capture_device_factory_android.h",
343 ] 343 ]
344 deps += [ 344 deps += [
345 "//media/base/android", 345 "//media/base/android",
346 "//media/base/android:media_java",
346 "//media/base/android:media_jni_headers", 347 "//media/base/android:media_jni_headers",
347 "//media/base/android:video_capture_jni_headers", 348 "//media/base/android:video_capture_jni_headers",
348 ] 349 ]
349 if (!is_android_webview_build) {
350 deps += [ "//media/base/android:media_java" ]
351 }
352 } 350 }
353 351
354 if (current_cpu != "arm" && is_chromeos) { 352 if (current_cpu != "arm" && is_chromeos) {
355 sources += [ 353 sources += [
356 "filters/h264_bitstream_buffer.cc", 354 "filters/h264_bitstream_buffer.cc",
357 "filters/h264_bitstream_buffer.h", 355 "filters/h264_bitstream_buffer.h",
358 ] 356 ]
359 } 357 }
360 358
361 if (use_alsa) { 359 if (use_alsa) {
(...skipping 452 matching lines...) Expand 10 before | Expand all | Expand 10 after
814 ":media", 812 ":media",
815 ":shared_memory_support", 813 ":shared_memory_support",
816 "//base", 814 "//base",
817 "//tools/xdisplaycheck", 815 "//tools/xdisplaycheck",
818 "//ui/gl", 816 "//ui/gl",
819 "//ui/gfx", 817 "//ui/gfx",
820 "//ui/gfx/geometry", 818 "//ui/gfx/geometry",
821 ] 819 ]
822 } 820 }
823 } 821 }
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