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

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

Issue 2373683003: Remove som GYP annotations, remove unused manifest. (Closed)
Patch Set: Fix Created 4 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
« no previous file with comments | « content/shell/BUILD.gn ('k') | content/shell/app/shell.exe.manifest » ('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 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 output = chromium_linker_test_manifest 174 output = chromium_linker_test_manifest
175 } 175 }
176 176
177 android_resources("linker_resources") { 177 android_resources("linker_resources") {
178 testonly = true 178 testonly = true
179 resource_dirs = [ "linker_test_apk/res" ] 179 resource_dirs = [ "linker_test_apk/res" ]
180 android_manifest = chromium_linker_test_manifest 180 android_manifest = chromium_linker_test_manifest
181 android_manifest_dep = ":chromium_linker_test_manifest" 181 android_manifest_dep = ":chromium_linker_test_manifest"
182 } 182 }
183 183
184 # GYP: //content/content_tests.gypi:chromium_linker_test_apk
185 android_apk("chromium_linker_test_apk") { 184 android_apk("chromium_linker_test_apk") {
186 testonly = true 185 testonly = true
187 deps = [ 186 deps = [
188 ":content_shell_assets", 187 ":content_shell_assets",
189 ":content_shell_java", 188 ":content_shell_java",
190 ":linker_resources", 189 ":linker_resources",
191 "//base:base_java", 190 "//base:base_java",
192 "//content/public/android:content_java", 191 "//content/public/android:content_java",
193 "//ui/android:ui_java", 192 "//ui/android:ui_java",
194 ] 193 ]
195 android_manifest = chromium_linker_test_manifest 194 android_manifest = chromium_linker_test_manifest
196 android_manifest_dep = ":chromium_linker_test_manifest" 195 android_manifest_dep = ":chromium_linker_test_manifest"
197 apk_name = "ChromiumLinkerTest" 196 apk_name = "ChromiumLinkerTest"
198 java_files = [ 197 java_files = [
199 "linker_test_apk/src/org/chromium/chromium_linker_test_apk/ChromiumLinkerT estActivity.java", 198 "linker_test_apk/src/org/chromium/chromium_linker_test_apk/ChromiumLinkerT estActivity.java",
200 "linker_test_apk/src/org/chromium/chromium_linker_test_apk/ChromiumLinkerT estApplication.java", 199 "linker_test_apk/src/org/chromium/chromium_linker_test_apk/ChromiumLinkerT estApplication.java",
201 "linker_test_apk/src/org/chromium/chromium_linker_test_apk/LinkerTests.jav a", 200 "linker_test_apk/src/org/chromium/chromium_linker_test_apk/LinkerTests.jav a",
202 ] 201 ]
203 shared_libraries = [ ":linker_test" ] 202 shared_libraries = [ ":linker_test" ]
204 use_chromium_linker = true 203 use_chromium_linker = true
205 enable_chromium_linker_tests = true 204 enable_chromium_linker_tests = true
206 } 205 }
207 206
208 # GYP: //content/content_tests.gypi:chromium_android_linker_test
209 shared_library("linker_test") { 207 shared_library("linker_test") {
210 testonly = true 208 testonly = true
211 sources = [ 209 sources = [
212 "linker_test_apk/chromium_linker_test_android.cc", 210 "linker_test_apk/chromium_linker_test_android.cc",
213 "linker_test_apk/chromium_linker_test_linker_tests.cc", 211 "linker_test_apk/chromium_linker_test_linker_tests.cc",
214 ] 212 ]
215 213
216 deps = [ 214 deps = [
217 ":linker_test_jni_headers", 215 ":linker_test_jni_headers",
218 "//build/config/sanitizers:deps", 216 "//build/config/sanitizers:deps",
219 "//content/shell:content_shell_lib", 217 "//content/shell:content_shell_lib",
220 218
221 # Required to include "content/public/browser/android/compositor.h" 219 # Required to include "content/public/browser/android/compositor.h"
222 # in chromium_linker_test_android.cc :-( 220 # in chromium_linker_test_android.cc :-(
223 "//skia", 221 "//skia",
224 "//third_party/re2", 222 "//third_party/re2",
225 ] 223 ]
226 } 224 }
227 225
228 # GYP: //content/content_tests.gypi:chromium_android_linker_test_jni_headers
229 generate_jni("linker_test_jni_headers") { 226 generate_jni("linker_test_jni_headers") {
230 testonly = true 227 testonly = true
231 jni_package = "content/shell" 228 jni_package = "content/shell"
232 sources = [ 229 sources = [
233 "linker_test_apk/src/org/chromium/chromium_linker_test_apk/LinkerTests.jav a", 230 "linker_test_apk/src/org/chromium/chromium_linker_test_apk/LinkerTests.jav a",
234 ] 231 ]
235 } 232 }
236 } 233 }
237 234
238 # GYP: //content/content_tests.gypi:content_shell_browsertests_java"
239 android_library("content_shell_browsertests_java") { 235 android_library("content_shell_browsertests_java") {
240 testonly = true 236 testonly = true
241 deps = [ 237 deps = [
242 ":content_shell_java", 238 ":content_shell_java",
243 "//base:base_java", 239 "//base:base_java",
244 "//content/public/android:content_java", 240 "//content/public/android:content_java",
245 "//testing/android/native_test:native_test_java", 241 "//testing/android/native_test:native_test_java",
246 "//ui/android:ui_java", 242 "//ui/android:ui_java",
247 ] 243 ]
248 java_files = [ "browsertests/src/org/chromium/content_shell/browsertests/Conte ntShellBrowserTestActivity.java" ] 244 java_files = [ "browsertests/src/org/chromium/content_shell/browsertests/Conte ntShellBrowserTestActivity.java" ]
249 } 245 }
OLDNEW
« no previous file with comments | « content/shell/BUILD.gn ('k') | content/shell/app/shell.exe.manifest » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698