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

Side by Side Diff: build/config/android/internal_rules.gni

Issue 2871283002: Run lint on javac output instead of process_java_prebuilt output. (Closed)
Patch Set: Created 3 years, 7 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 | « no previous file | no next file » | 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 # Do not add any imports to non-//build directories here. 5 # Do not add any imports to non-//build directories here.
6 # Some projects (e.g. V8) do not have non-build directories DEPS'ed in. 6 # Some projects (e.g. V8) do not have non-build directories DEPS'ed in.
7 import("//build_overrides/build.gni") 7 import("//build_overrides/build.gni")
8 import("//build/config/android/config.gni") 8 import("//build/config/android/config.gni")
9 import("//build/config/dcheck_always_on.gni") 9 import("//build/config/dcheck_always_on.gni")
10 import("//build/config/sanitizers/sanitizers.gni") 10 import("//build/config/sanitizers/sanitizers.gni")
(...skipping 2251 matching lines...) Expand 10 before | Expand all | Expand 10 after
2262 deps = [ 2262 deps = [
2263 ":$_javac_target_name", 2263 ":$_javac_target_name",
2264 ] 2264 ]
2265 output_jar = _final_ijar_path 2265 output_jar = _final_ijar_path
2266 } 2266 }
2267 2267
2268 group(_final_target_name) { 2268 group(_final_target_name) {
2269 forward_variables_from(invoker, [ "visibility" ]) 2269 forward_variables_from(invoker, [ "visibility" ])
2270 public_deps = [ 2270 public_deps = [
2271 ":$_ijar_target_name", 2271 ":$_ijar_target_name",
2272 ":$_javac_target_name",
2272 ] 2273 ]
2273 if (_emma_instrument) { 2274 if (_emma_instrument) {
2274 public_deps += [ ":$_emma_instr_target_name" ] 2275 public_deps += [ ":$_emma_instr_target_name" ]
2275 } else { 2276 } else {
2276 public_deps += [ ":$_process_prebuilt_target_name" ] 2277 public_deps += [ ":$_process_prebuilt_target_name" ]
2277 } 2278 }
2278 } 2279 }
2279 } 2280 }
2280 2281
2281 template("java_library_impl") { 2282 template("java_library_impl") {
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
2498 } 2499 }
2499 } 2500 }
2500 2501
2501 _has_lint_target = false 2502 _has_lint_target = false
2502 if (_supports_android) { 2503 if (_supports_android) {
2503 if (_chromium_code) { 2504 if (_chromium_code) {
2504 _has_lint_target = true 2505 _has_lint_target = true
2505 android_lint("${_template_name}__lint") { 2506 android_lint("${_template_name}__lint") {
2506 android_manifest = _android_manifest 2507 android_manifest = _android_manifest
2507 build_config = _build_config 2508 build_config = _build_config
2508 jar_path = _jar_path 2509
2510 # Run lint on javac output.
2511 jar_path = "$target_gen_dir/$_compile_java_target.javac.jar"
2512
2509 java_files = _java_files 2513 java_files = _java_files
2510 if (_java_files != []) { 2514 if (_java_files != []) {
2511 java_sources_file = _java_sources_file 2515 java_sources_file = _java_sources_file
2512 } 2516 }
2513 deps = _accumulated_deps 2517 deps = _accumulated_deps
2514 if (_emma_instrument) { 2518 if (_emma_instrument) {
2515 # Disable the NewApi lint warning when building with coverage 2519 # Disable the NewApi lint warning when building with coverage
2516 # enabled. Coverage seems to mess with how the linter detects 2520 # enabled. Coverage seems to mess with how the linter detects
2517 # the usages of a new API within a conditional. See 2521 # the usages of a new API within a conditional. See
2518 # crbug.com/677320 for more. 2522 # crbug.com/677320 for more.
(...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after
2852 rebase_path(root_build_dir, root_build_dir), 2856 rebase_path(root_build_dir, root_build_dir),
2853 "--packed-libraries-dir", 2857 "--packed-libraries-dir",
2854 rebase_path(_packed_libraries_dir, root_build_dir), 2858 rebase_path(_packed_libraries_dir, root_build_dir),
2855 "--libraries=${invoker.libraries_filearg}", 2859 "--libraries=${invoker.libraries_filearg}",
2856 "--filelistjson", 2860 "--filelistjson",
2857 rebase_path(invoker.file_list_json, root_build_dir), 2861 rebase_path(invoker.file_list_json, root_build_dir),
2858 ] 2862 ]
2859 } 2863 }
2860 } 2864 }
2861 } 2865 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698