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

Side by Side Diff: content/shell/android/BUILD.gn

Issue 1829823002: Replace usages of DEPRECATED_java_in_dir with java_files (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: zap random comment Created 4 years, 9 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 | « content/public/test/android/BUILD.gn ('k') | content/test/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/android/rules.gni") 6 import("//build/config/android/rules.gni")
7 import("//build_overrides/v8.gni") 7 import("//build_overrides/v8.gni")
8 import("//third_party/icu/config.gni") 8 import("//third_party/icu/config.gni")
9 9
10 generate_jni("content_shell_jni_headers") { 10 generate_jni("content_shell_jni_headers") {
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 deps = [ 44 deps = [
45 ":content_shell_java_resources", 45 ":content_shell_java_resources",
46 "//base:base_java", 46 "//base:base_java",
47 "//content/public/android:content_java", 47 "//content/public/android:content_java",
48 "//media/base/android:media_java", 48 "//media/base/android:media_java",
49 "//media/capture/video/android:capture_java", 49 "//media/capture/video/android:capture_java",
50 "//mojo/public/java:system", 50 "//mojo/public/java:system",
51 "//net/android:net_java", 51 "//net/android:net_java",
52 "//ui/android:ui_java", 52 "//ui/android:ui_java",
53 ] 53 ]
54 DEPRECATED_java_in_dir = "java/src" 54 java_files = [
55 "java/src/org/chromium/content_shell/Shell.java",
56 "java/src/org/chromium/content_shell/ShellLayoutTestUtils.java",
57 "java/src/org/chromium/content_shell/ShellManager.java",
58 "java/src/org/chromium/content_shell/ShellMojoTestUtils.java",
59 ]
55 } 60 }
56 61
57 content_shell_manifest = 62 content_shell_manifest =
58 "$target_gen_dir/content_shell_manifest/AndroidManifest.xml" 63 "$target_gen_dir/content_shell_manifest/AndroidManifest.xml"
59 64
60 jinja_template("content_shell_manifest") { 65 jinja_template("content_shell_manifest") {
61 testonly = true 66 testonly = true
62 input = "shell_apk/AndroidManifest.xml.jinja2" 67 input = "shell_apk/AndroidManifest.xml.jinja2"
63 output = content_shell_manifest 68 output = content_shell_manifest
64 } 69 }
(...skipping 12 matching lines...) Expand all
77 testonly = true 82 testonly = true
78 deps = [ 83 deps = [
79 ":content_shell_apk_resources", 84 ":content_shell_apk_resources",
80 ":content_shell_java", 85 ":content_shell_java",
81 "//base:base_java", 86 "//base:base_java",
82 "//content/public/android:content_java", 87 "//content/public/android:content_java",
83 "//media/capture/video/android:capture_java", 88 "//media/capture/video/android:capture_java",
84 "//net/android:net_java", 89 "//net/android:net_java",
85 "//ui/android:ui_java", 90 "//ui/android:ui_java",
86 ] 91 ]
87 DEPRECATED_java_in_dir = "shell_apk/src" 92 java_files = [
93 "shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java",
94 "shell_apk/src/org/chromium/content_shell_apk/ContentShellApplication.java",
95 ]
88 } 96 }
89 97
90 android_assets("content_shell_assets") { 98 android_assets("content_shell_assets") {
91 sources = [ 99 sources = [
92 "$root_out_dir/content_shell.pak", 100 "$root_out_dir/content_shell.pak",
93 ] 101 ]
94 disable_compression = true 102 disable_compression = true
95 deps = [ 103 deps = [
96 "//content/shell:pak", 104 "//content/shell:pak",
97 "//third_party/icu:icu_assets", 105 "//third_party/icu:icu_assets",
(...skipping 27 matching lines...) Expand all
125 testonly = true 133 testonly = true
126 deps = [ 134 deps = [
127 ":content_shell_apk_java", 135 ":content_shell_apk_java",
128 ":content_shell_java", 136 ":content_shell_java",
129 "//base:base_java", 137 "//base:base_java",
130 "//base:base_java_test_support", 138 "//base:base_java_test_support",
131 "//content/public/android:content_java", 139 "//content/public/android:content_java",
132 "//content/public/test/android:content_java_test_support", 140 "//content/public/test/android:content_java_test_support",
133 "//content/shell/android:content_shell_java", 141 "//content/shell/android:content_shell_java",
134 ] 142 ]
135 DEPRECATED_java_in_dir = "javatests/src" 143 java_files = [
144 "javatests/src/org/chromium/content_shell_apk/ContentShellPreconditionsTest. java",
145 "javatests/src/org/chromium/content_shell_apk/ContentShellShellManagementTes t.java",
146 "javatests/src/org/chromium/content_shell_apk/ContentShellTestBase.java",
147 "javatests/src/org/chromium/content_shell_apk/ContentShellUrlTest.java",
148 ]
136 } 149 }
137 150
138 instrumentation_test_apk("content_shell_test_apk") { 151 instrumentation_test_apk("content_shell_test_apk") {
139 deps = [ 152 deps = [
140 "//base:base_javatests", 153 "//base:base_javatests",
141 "//content/public/android:content_javatests", 154 "//content/public/android:content_javatests",
142 "//net/android:net_javatests", 155 "//net/android:net_javatests",
143 ] 156 ]
144 data_deps = [ 157 data_deps = [
145 ":content_shell_apk", 158 ":content_shell_apk",
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 ":content_shell_assets", 190 ":content_shell_assets",
178 ":content_shell_java", 191 ":content_shell_java",
179 ":linker_resources", 192 ":linker_resources",
180 ":linker_test", 193 ":linker_test",
181 "//base:base_java", 194 "//base:base_java",
182 "//content/public/android:content_java", 195 "//content/public/android:content_java",
183 "//ui/android:ui_java", 196 "//ui/android:ui_java",
184 ] 197 ]
185 android_manifest = chromium_linker_test_manifest 198 android_manifest = chromium_linker_test_manifest
186 apk_name = "ChromiumLinkerTest" 199 apk_name = "ChromiumLinkerTest"
187 DEPRECATED_java_in_dir = "linker_test_apk/src" 200 java_files = [
201 "linker_test_apk/src/org/chromium/chromium_linker_test_apk/ChromiumLinkerT estActivity.java",
202 "linker_test_apk/src/org/chromium/chromium_linker_test_apk/ChromiumLinkerT estApplication.java",
203 "linker_test_apk/src/org/chromium/chromium_linker_test_apk/LinkerTests.jav a",
204 ]
188 native_libs = [ "liblinker_test.so" ] 205 native_libs = [ "liblinker_test.so" ]
189 use_chromium_linker = true 206 use_chromium_linker = true
190 enable_chromium_linker_tests = true 207 enable_chromium_linker_tests = true
191 } 208 }
192 209
193 # GYP: //content/content_tests.gypi:chromium_android_linker_test 210 # GYP: //content/content_tests.gypi:chromium_android_linker_test
194 shared_library("linker_test") { 211 shared_library("linker_test") {
195 testonly = true 212 testonly = true
196 sources = [ 213 sources = [
197 "linker_test_apk/chromium_linker_test_android.cc", 214 "linker_test_apk/chromium_linker_test_android.cc",
(...skipping 25 matching lines...) Expand all
223 # GYP: //content/content_tests.gypi:content_shell_browsertests_java" 240 # GYP: //content/content_tests.gypi:content_shell_browsertests_java"
224 android_library("content_shell_browsertests_java") { 241 android_library("content_shell_browsertests_java") {
225 testonly = true 242 testonly = true
226 deps = [ 243 deps = [
227 ":content_shell_java", 244 ":content_shell_java",
228 "//base:base_java", 245 "//base:base_java",
229 "//content/public/android:content_java", 246 "//content/public/android:content_java",
230 "//testing/android/native_test:native_test_java", 247 "//testing/android/native_test:native_test_java",
231 "//ui/android:ui_java", 248 "//ui/android:ui_java",
232 ] 249 ]
233 DEPRECATED_java_in_dir = "browsertests/src" 250 java_files = [ "browsertests/src/org/chromium/content_shell/browsertests/Conte ntShellBrowserTestActivity.java" ]
234 } 251 }
OLDNEW
« no previous file with comments | « content/public/test/android/BUILD.gn ('k') | content/test/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698