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

Side by Side Diff: chrome/android/BUILD.gn

Issue 797403005: Revert of Use SuppressFBWarnings to suppress findbugs warnings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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/module_args/v8.gni") 7 import("//build/module_args/v8.gni")
8 import("//chrome/version.gni") 8 import("//chrome/version.gni")
9 import("//third_party/icu/config.gni") 9 import("//third_party/icu/config.gni")
10 import("channel.gni") 10 import("channel.gni")
(...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after
344 jinja_template("chrome_shell_manifest") { 344 jinja_template("chrome_shell_manifest") {
345 testonly = true 345 testonly = true
346 input = "shell/java/AndroidManifest.xml.jinja2" 346 input = "shell/java/AndroidManifest.xml.jinja2"
347 output = chrome_shell_manifest 347 output = chrome_shell_manifest
348 } 348 }
349 349
350 # GYP: //chrome/chrome_shell.gypi:chrome_shell_apk 350 # GYP: //chrome/chrome_shell.gypi:chrome_shell_apk
351 android_apk("chrome_shell_apk") { 351 android_apk("chrome_shell_apk") {
352 testonly = true 352 testonly = true
353 deps = [ 353 deps = [
354 "//base:base_java",
355 ":chrome_shell_resources", 354 ":chrome_shell_resources",
356 ":chrome_shell_java", 355 ":chrome_shell_java",
357 ":chrome_shell_assets", 356 ":chrome_shell_assets",
358 ":chrome_shell", 357 ":chrome_shell",
359 ] 358 ]
360 apk_name = "ChromeShell" 359 apk_name = "ChromeShell"
361 android_manifest = chrome_shell_manifest 360 android_manifest = chrome_shell_manifest
362 native_libs = [ "libchrome_shell.so" ] 361 native_libs = [ "libchrome_shell.so" ]
363 asset_location = chrome_shell_assets_dir 362 asset_location = chrome_shell_assets_dir
364 363
(...skipping 16 matching lines...) Expand all
381 jinja_template("chrome_sync_shell_manifest") { 380 jinja_template("chrome_sync_shell_manifest") {
382 testonly = true 381 testonly = true
383 input = "sync_shell/java/AndroidManifest.xml.jinja2" 382 input = "sync_shell/java/AndroidManifest.xml.jinja2"
384 output = chrome_sync_shell_manifest 383 output = chrome_sync_shell_manifest
385 } 384 }
386 385
387 # GYP: //chrome/chrome_shell.gypi:chrome_sync_shell_apk 386 # GYP: //chrome/chrome_shell.gypi:chrome_sync_shell_apk
388 android_apk("chrome_sync_shell_apk") { 387 android_apk("chrome_sync_shell_apk") {
389 testonly = true 388 testonly = true
390 deps = [ 389 deps = [
391 "//base:base_java",
392 ":chrome_shell_resources", 390 ":chrome_shell_resources",
393 ":chrome_shell_java", 391 ":chrome_shell_java",
394 ":chrome_shell_assets", 392 ":chrome_shell_assets",
395 ":chrome_sync_shell", 393 ":chrome_sync_shell",
396 ] 394 ]
397 apk_name = "ChromeSyncShell" 395 apk_name = "ChromeSyncShell"
398 android_manifest = chrome_sync_shell_manifest 396 android_manifest = chrome_sync_shell_manifest
399 native_libs = [ "libchrome_sync_shell.so" ] 397 native_libs = [ "libchrome_sync_shell.so" ]
400 asset_location = chrome_shell_assets_dir 398 asset_location = chrome_shell_assets_dir
401 } 399 }
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
513 ] 511 ]
514 } 512 }
515 513
516 zip("chrome_version_srcjar") { 514 zip("chrome_version_srcjar") {
517 inputs = [ 515 inputs = [
518 chrome_version_java_file, 516 chrome_version_java_file,
519 ] 517 ]
520 output = "$target_gen_dir/$target_name.srcjar" 518 output = "$target_gen_dir/$target_name.srcjar"
521 base_dir = chrome_version_java_dir 519 base_dir = chrome_version_java_dir
522 } 520 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698