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

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

Issue 606343003: Rename AndroidImage format template to match the Java class. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix webview build Created 6 years, 2 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
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/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 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
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_template("media_android_imageformat_list") {
95 package_name = "org/chromium/media" 95 package_name = "org/chromium/media"
96 sources = [ 96 sources = [
97 "java/src/org/chromium/media/ImageFormat.template", 97 "java/src/org/chromium/media/AndroidImageFormat.template",
98 ] 98 ]
99 inputs = [ 99 inputs = [
100 "//media/video/capture/android/imageformat_list.h" 100 "//media/video/capture/android/imageformat_list.h"
101 ] 101 ]
102 } 102 }
103 103
104 android_library("media_java") { 104 android_library("media_java") {
105 deps = [ 105 deps = [
106 "//base:base_java", 106 "//base:base_java",
107 ] 107 ]
108 108
109 srcjar_deps = [ 109 srcjar_deps = [
110 ":media_android_imageformat_list", 110 ":media_android_imageformat_list",
111 ] 111 ]
112 112
113 DEPRECATED_java_in_dir = "java/src" 113 DEPRECATED_java_in_dir = "java/src"
114 } 114 }
OLDNEW
« no previous file with comments | « android_webview/java_library_common.mk ('k') | media/base/android/java/src/org/chromium/media/AndroidImageFormat.template » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698