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

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

Issue 1870073002: Properly set up classpath for Android Lint (and fix its stderr filter) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Skip --android-sdk-version for GYP build Created 4 years, 8 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 | « build/android/gyp/lint.py ('k') | 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 import("//build/config/android/config.gni") 5 import("//build/config/android/config.gni")
6 import("//build/config/sanitizers/sanitizers.gni") 6 import("//build/config/sanitizers/sanitizers.gni")
7 import("//build/config/zip.gni") 7 import("//build/config/zip.gni")
8 import("//third_party/ijar/ijar.gni") 8 import("//third_party/ijar/ijar.gni")
9 9
10 assert(is_android) 10 assert(is_android)
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 _config_path, 53 _config_path,
54 _result_path, 54 _result_path,
55 ] 55 ]
56 56
57 args = [ 57 args = [
58 "--lint-path=$rebased_android_sdk_root/tools/lint", 58 "--lint-path=$rebased_android_sdk_root/tools/lint",
59 "--cache-dir", 59 "--cache-dir",
60 rebase_path(_cache_dir, root_build_dir), 60 rebase_path(_cache_dir, root_build_dir),
61 "--platform-xml-path", 61 "--platform-xml-path",
62 rebase_path(_platform_xml_path, root_build_dir), 62 rebase_path(_platform_xml_path, root_build_dir),
63 "--android-sdk-version=${android_sdk_version}",
63 "--depfile", 64 "--depfile",
64 rebase_path(depfile, root_build_dir), 65 rebase_path(depfile, root_build_dir),
65 "--config-path", 66 "--config-path",
66 rebase_path(_suppressions_file, root_build_dir), 67 rebase_path(_suppressions_file, root_build_dir),
67 "--manifest-path", 68 "--manifest-path",
68 rebase_path(invoker.android_manifest, root_build_dir), 69 rebase_path(invoker.android_manifest, root_build_dir),
69 "--product-dir=.", 70 "--product-dir=.",
70 "--processed-config-path", 71 "--processed-config-path",
71 rebase_path(_config_path, root_build_dir), 72 rebase_path(_config_path, root_build_dir),
72 "--result-path", 73 "--result-path",
(...skipping 12 matching lines...) Expand all
85 invoker.jar_path, 86 invoker.jar_path,
86 invoker.build_config, 87 invoker.build_config,
87 ] 88 ]
88 deps += [ "//build/android:prepare_android_lint_cache" ] 89 deps += [ "//build/android:prepare_android_lint_cache" ]
89 _rebased_java_files = rebase_path(invoker.java_files, root_build_dir) 90 _rebased_java_files = rebase_path(invoker.java_files, root_build_dir)
90 _rebased_build_config = rebase_path(invoker.build_config, root_build_dir) 91 _rebased_build_config = rebase_path(invoker.build_config, root_build_dir)
91 args += [ 92 args += [
92 "--jar-path", 93 "--jar-path",
93 rebase_path(invoker.jar_path, root_build_dir), 94 rebase_path(invoker.jar_path, root_build_dir),
94 "--java-files=$_rebased_java_files", 95 "--java-files=$_rebased_java_files",
95 "--classpath=['$rebased_android_sdk_jar']", 96 "--classpath=@FileArg($_rebased_build_config:javac:classpath)",
96 "--classpath=@FileArg($_rebased_build_config:javac:interface_classpath)" ,
97 ] 97 ]
98 } 98 }
99 } 99 }
100 } 100 }
101 101
102 template("proguard") { 102 template("proguard") {
103 action(target_name) { 103 action(target_name) {
104 set_sources_assignment_filter([]) 104 set_sources_assignment_filter([])
105 forward_variables_from(invoker, 105 forward_variables_from(invoker,
106 [ 106 [
(...skipping 2079 matching lines...) Expand 10 before | Expand all | Expand 10 after
2186 2186
2187 args = [ 2187 args = [
2188 "--depfile", 2188 "--depfile",
2189 rebase_path(depfile, root_build_dir), 2189 rebase_path(depfile, root_build_dir),
2190 "--script-output-path", 2190 "--script-output-path",
2191 rebase_path(generated_script, root_build_dir), 2191 rebase_path(generated_script, root_build_dir),
2192 ] 2192 ]
2193 args += test_runner_args 2193 args += test_runner_args
2194 } 2194 }
2195 } 2195 }
OLDNEW
« no previous file with comments | « build/android/gyp/lint.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698