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

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

Issue 1136573002: Use the Errorprone Compiler (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: use public jar instead of local Created 5 years, 6 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 876 matching lines...) Expand 10 before | Expand all | Expand 10 after
887 887
888 _jar_excluded_patterns = [] 888 _jar_excluded_patterns = []
889 if (defined(invoker.jar_excluded_patterns)) { 889 if (defined(invoker.jar_excluded_patterns)) {
890 _jar_excluded_patterns += invoker.jar_excluded_patterns 890 _jar_excluded_patterns += invoker.jar_excluded_patterns
891 } 891 }
892 892
893 _chromium_code = false 893 _chromium_code = false
894 if (defined(invoker.chromium_code)) { 894 if (defined(invoker.chromium_code)) {
895 _chromium_code = invoker.chromium_code 895 _chromium_code = invoker.chromium_code
896 } 896 }
897
898 _enable_errorprone = use_errorprone_java_compiler
899 if (defined(invoker.enable_errorprone)) {
900 _enable_errorprone = invoker.enable_errorprone
901 }
902
897 _manifest_entries = [] 903 _manifest_entries = []
898 if (defined(invoker.manifest_entries)) { 904 if (defined(invoker.manifest_entries)) {
899 _manifest_entries = invoker.manifest_entries 905 _manifest_entries = invoker.manifest_entries
900 } 906 }
901 907
902 _srcjar_deps = [] 908 _srcjar_deps = []
903 if (defined(invoker.srcjar_deps)) { 909 if (defined(invoker.srcjar_deps)) {
904 _srcjar_deps += invoker.srcjar_deps 910 _srcjar_deps += invoker.srcjar_deps
905 } 911 }
906 912
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
956 "--java-srcjars=$_rebased_java_srcjars", 962 "--java-srcjars=$_rebased_java_srcjars",
957 "--java-srcjars=@FileArg($_rebased_build_config:javac:srcjars)", 963 "--java-srcjars=@FileArg($_rebased_build_config:javac:srcjars)",
958 "--jar-excluded-classes=$_jar_excluded_patterns", 964 "--jar-excluded-classes=$_jar_excluded_patterns",
959 ] 965 ]
960 foreach(e, _manifest_entries) { 966 foreach(e, _manifest_entries) {
961 args += [ "--manifest-entry=" + e ] 967 args += [ "--manifest-entry=" + e ]
962 } 968 }
963 if (_chromium_code) { 969 if (_chromium_code) {
964 args += [ "--chromium-code=1" ] 970 args += [ "--chromium-code=1" ]
965 } 971 }
966 972 if (_enable_errorprone) {
973 deps += [ "//third_party/errorprone:chromium_errorprone" ]
974 args += [
975 "--use-errorprone-path",
976 "bin/chromium_errorprone",
977 ]
978 }
967 args += rebase_path(_java_files, root_build_dir) 979 args += rebase_path(_java_files, root_build_dir)
968 } 980 }
969 981
970 process_java_prebuilt(finish_target_name) { 982 process_java_prebuilt(finish_target_name) {
971 visibility = [ ":$final_target_name" ] 983 visibility = [ ":$final_target_name" ]
972 984
973 build_config = _build_config 985 build_config = _build_config
974 input_jar_path = _intermediate_jar_path 986 input_jar_path = _intermediate_jar_path
975 output_jar_path = _final_jar_path 987 output_jar_path = _final_jar_path
976 if (defined(invoker.proguard_preprocess) && invoker.proguard_preprocess) { 988 if (defined(invoker.proguard_preprocess) && invoker.proguard_preprocess) {
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
1106 _final_deps += [ ":$_compile_java_target" ] 1118 _final_deps += [ ":$_compile_java_target" ]
1107 compile_java(_compile_java_target) { 1119 compile_java(_compile_java_target) {
1108 jar_path = _jar_path 1120 jar_path = _jar_path
1109 build_config = _build_config 1121 build_config = _build_config
1110 java_files = _java_files 1122 java_files = _java_files
1111 srcjar_deps = _srcjar_deps 1123 srcjar_deps = _srcjar_deps
1112 srcjars = _srcjars 1124 srcjars = _srcjars
1113 chromium_code = _chromium_code 1125 chromium_code = _chromium_code
1114 android = _requires_android 1126 android = _requires_android
1115 1127
1128 if (defined(invoker.enable_errorprone)) {
1129 _enable_errorprone = invoker.enable_errorprone
1130 }
1116 if (defined(invoker.jar_excluded_patterns)) { 1131 if (defined(invoker.jar_excluded_patterns)) {
1117 jar_excluded_patterns = invoker.jar_excluded_patterns 1132 jar_excluded_patterns = invoker.jar_excluded_patterns
1118 } 1133 }
1119 if (defined(invoker.proguard_preprocess)) { 1134 if (defined(invoker.proguard_preprocess)) {
1120 proguard_preprocess = invoker.proguard_preprocess 1135 proguard_preprocess = invoker.proguard_preprocess
1121 } 1136 }
1122 if (defined(invoker.proguard_config)) { 1137 if (defined(invoker.proguard_config)) {
1123 proguard_config = invoker.proguard_config 1138 proguard_config = invoker.proguard_config
1124 } 1139 }
1125 if (defined(invoker.dist_jar_path)) { 1140 if (defined(invoker.dist_jar_path)) {
(...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after
1501 ] 1516 ]
1502 args = [ 1517 args = [
1503 "--depfile", 1518 "--depfile",
1504 rebase_path(depfile, root_build_dir), 1519 rebase_path(depfile, root_build_dir),
1505 "--script-output-path", 1520 "--script-output-path",
1506 rebase_path(generated_script, root_build_dir), 1521 rebase_path(generated_script, root_build_dir),
1507 ] 1522 ]
1508 args += test_runner_args 1523 args += test_runner_args
1509 } 1524 }
1510 } 1525 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698