| OLD | NEW | 
|---|
| 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/android/rules.gni") | 6 import("//build/config/android/rules.gni") | 
| 7 import("//build/config/arm.gni") | 7 import("//build/config/arm.gni") | 
| 8 import("//build/config/ui.gni") | 8 import("//build/config/ui.gni") | 
| 9 import("//media/media_options.gni") | 9 import("//media/media_options.gni") | 
| 10 | 10 | 
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 84 } | 84 } | 
| 85 | 85 | 
| 86 generate_jni("video_capture_jni_headers") { | 86 generate_jni("video_capture_jni_headers") { | 
| 87   sources = [ | 87   sources = [ | 
| 88     "java/src/org/chromium/media/VideoCapture.java", | 88     "java/src/org/chromium/media/VideoCapture.java", | 
| 89     "java/src/org/chromium/media/VideoCaptureFactory.java", | 89     "java/src/org/chromium/media/VideoCaptureFactory.java", | 
| 90   ] | 90   ] | 
| 91   jni_package = "media" | 91   jni_package = "media" | 
| 92 } | 92 } | 
| 93 | 93 | 
| 94 java_cpp_template("media_android_imageformat_list") { | 94 java_cpp_enum("media_java_enums_srcjar") { | 
| 95   package_name = "org/chromium/media" |  | 
| 96   sources = [ | 95   sources = [ | 
| 97     "java/src/org/chromium/media/AndroidImageFormat.template", | 96     "//media/video/capture/android/video_capture_device_android.h", | 
| 98   ] | 97   ] | 
| 99   inputs = [ | 98   outputs = [ | 
| 100     "//media/video/capture/android/imageformat_list.h" | 99     "org/chromium/media/AndroidImageFormat.java", | 
| 101   ] | 100   ] | 
| 102 } | 101 } | 
| 103 | 102 | 
| 104 android_library("media_java") { | 103 android_library("media_java") { | 
| 105   deps = [ | 104   deps = [ | 
| 106     "//base:base_java", | 105     "//base:base_java", | 
| 107   ] | 106   ] | 
| 108 | 107 | 
| 109   srcjar_deps = [ | 108   srcjar_deps = [ | 
| 110     ":media_android_imageformat_list", | 109     ":media_java_enums_srcjar", | 
| 111   ] | 110   ] | 
| 112 | 111 | 
| 113   DEPRECATED_java_in_dir = "java/src" | 112   DEPRECATED_java_in_dir = "java/src" | 
| 114 } | 113 } | 
| OLD | NEW | 
|---|