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

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

Issue 880083004: Change which manifest and resources are passed to lint.py. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Renamed res_dir to resource_dir in java.gypi. Created 5 years, 10 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 6
7 assert(is_android) 7 assert(is_android)
8 8
9 rebased_android_sdk = rebase_path(android_sdk, root_build_dir) 9 rebased_android_sdk = rebase_path(android_sdk, root_build_dir)
10 rebased_android_sdk_root = rebase_path(android_sdk_root, root_build_dir) 10 rebased_android_sdk_root = rebase_path(android_sdk_root, root_build_dir)
(...skipping 12 matching lines...) Expand all
23 jar_path = invoker.jar_path 23 jar_path = invoker.jar_path
24 android_manifest = invoker.android_manifest 24 android_manifest = invoker.android_manifest
25 java_files = invoker.java_files 25 java_files = invoker.java_files
26 base_path = "$target_gen_dir/$target_name" 26 base_path = "$target_gen_dir/$target_name"
27 27
28 action(target_name) { 28 action(target_name) {
29 script = "//build/android/gyp/lint.py" 29 script = "//build/android/gyp/lint.py"
30 result_path = base_path + "/result.xml" 30 result_path = base_path + "/result.xml"
31 config_path = base_path + "/config.xml" 31 config_path = base_path + "/config.xml"
32 suppressions_file = "//build/android/lint/suppressions.xml" 32 suppressions_file = "//build/android/lint/suppressions.xml"
33 resource_dir = "//build/android/ant/empty/res"
33 inputs = [ 34 inputs = [
34 suppressions_file, 35 suppressions_file,
35 android_manifest, 36 android_manifest,
36 jar_path, 37 jar_path,
37 ] + java_files 38 ] + java_files
38 39
39 outputs = [ 40 outputs = [
40 config_path, 41 config_path,
41 result_path, 42 result_path,
42 ] 43 ]
43 44
44 rebased_java_files = rebase_path(java_files, root_build_dir) 45 rebased_java_files = rebase_path(java_files, root_build_dir)
45 46
46 args = [ 47 args = [
47 "--lint-path=$rebased_android_sdk_root/tools/lint", 48 "--lint-path=$rebased_android_sdk_root/tools/lint",
48 "--config-path", 49 "--config-path",
49 rebase_path(suppressions_file, root_build_dir), 50 rebase_path(suppressions_file, root_build_dir),
50 "--manifest-path", 51 "--manifest-path",
51 rebase_path(android_manifest, root_build_dir), 52 rebase_path(android_manifest, root_build_dir),
52 "--product-dir=.", 53 "--product-dir=.",
53 "--jar-path", 54 "--jar-path",
54 rebase_path(jar_path, root_build_dir), 55 rebase_path(jar_path, root_build_dir),
56 "--resource-dir",
57 rebase_path(resource_dir, root_build_dir),
55 "--processed-config-path", 58 "--processed-config-path",
56 rebase_path(config_path, root_build_dir), 59 rebase_path(config_path, root_build_dir),
57 "--result-path", 60 "--result-path",
58 rebase_path(result_path, root_build_dir), 61 rebase_path(result_path, root_build_dir),
59 "--java-files=$rebased_java_files", 62 "--java-files=$rebased_java_files",
60 "--enable", 63 "--enable",
61 ] 64 ]
62 } 65 }
63 } 66 }
64 67
(...skipping 1013 matching lines...) Expand 10 before | Expand all | Expand 10 after
1078 rebased_build_config = rebase_path(build_config, root_build_dir) 1081 rebased_build_config = rebase_path(build_config, root_build_dir)
1079 dex(target_name) { 1082 dex(target_name) {
1080 inputs = [ 1083 inputs = [
1081 build_config, 1084 build_config,
1082 ] 1085 ]
1083 output = invoker.dex_path 1086 output = invoker.dex_path
1084 dex_arg_key = "${rebased_build_config}:final_dex:dependency_dex_files" 1087 dex_arg_key = "${rebased_build_config}:final_dex:dependency_dex_files"
1085 args = [ "--inputs=@FileArg($dex_arg_key)" ] 1088 args = [ "--inputs=@FileArg($dex_arg_key)" ]
1086 } 1089 }
1087 } 1090 }
OLDNEW
« build/android/gyp/lint.py ('K') | « build/android/lint_action.gypi ('k') | build/java.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698