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

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

Issue 1714913002: Reland: Move VideoCapture* files from media/base/android/... to media/capture/video/android/java/... (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: gyp-gn files and added a capture_jni_registrar Created 4 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 unified diff | Download patch
« no previous file with comments | « media/BUILD.gn ('k') | media/base/android/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/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 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 "media_file_checker.h", 242 "media_file_checker.h",
243 ] 243 ]
244 } 244 }
245 245
246 deps += [ "//third_party/ffmpeg" ] 246 deps += [ "//third_party/ffmpeg" ]
247 } 247 }
248 248
249 if (is_android) { 249 if (is_android) {
250 public_deps = [ 250 public_deps = [
251 "//media/base/android", 251 "//media/base/android",
252 "//media/base/android:media_java",
253 "//media/base/android:media_jni_headers", 252 "//media/base/android:media_jni_headers",
254 "//media/base/android:video_capture_jni_headers",
255 ] 253 ]
256 allow_circular_includes_from += [ "//media/base/android" ] 254 allow_circular_includes_from += [ "//media/base/android" ]
257 } 255 }
258 256
259 if (is_linux && use_x11) { 257 if (is_linux && use_x11) {
260 configs += [ 258 configs += [
261 "//build/config/linux:x11", 259 "//build/config/linux:x11",
262 "//build/config/linux:xext", 260 "//build/config/linux:xext",
263 261
264 # TODO(ajwong): Why does xent get a separate thing in //build/config/linux :BUILD.gn 262 # TODO(ajwong): Why does xent get a separate thing in //build/config/linux :BUILD.gn
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
550 } 548 }
551 549
552 fuzzer_test("media_container_names_fuzzer") { 550 fuzzer_test("media_container_names_fuzzer") {
553 sources = [ 551 sources = [
554 "container_names_fuzzertest.cc", 552 "container_names_fuzzertest.cc",
555 ] 553 ]
556 deps = [ 554 deps = [
557 "//media", 555 "//media",
558 ] 556 ]
559 } 557 }
OLDNEW
« no previous file with comments | « media/BUILD.gn ('k') | media/base/android/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698