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

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: Full Sync and Update 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
« no previous file with comments | « build/config/android/config.gni ('k') | build/config/android/rules.gni » ('j') | 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 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 891 matching lines...) Expand 10 before | Expand all | Expand 10 after
902 902
903 _jar_excluded_patterns = [] 903 _jar_excluded_patterns = []
904 if (defined(invoker.jar_excluded_patterns)) { 904 if (defined(invoker.jar_excluded_patterns)) {
905 _jar_excluded_patterns += invoker.jar_excluded_patterns 905 _jar_excluded_patterns += invoker.jar_excluded_patterns
906 } 906 }
907 907
908 _chromium_code = false 908 _chromium_code = false
909 if (defined(invoker.chromium_code)) { 909 if (defined(invoker.chromium_code)) {
910 _chromium_code = invoker.chromium_code 910 _chromium_code = invoker.chromium_code
911 } 911 }
912
913 _enable_errorprone = use_errorprone_java_compiler
914 if (defined(invoker.enable_errorprone)) {
915 _enable_errorprone = invoker.enable_errorprone
916 }
917
912 _manifest_entries = [] 918 _manifest_entries = []
913 if (defined(invoker.manifest_entries)) { 919 if (defined(invoker.manifest_entries)) {
914 _manifest_entries = invoker.manifest_entries 920 _manifest_entries = invoker.manifest_entries
915 } 921 }
916 922
917 _srcjar_deps = [] 923 _srcjar_deps = []
918 if (defined(invoker.srcjar_deps)) { 924 if (defined(invoker.srcjar_deps)) {
919 _srcjar_deps += invoker.srcjar_deps 925 _srcjar_deps += invoker.srcjar_deps
920 } 926 }
921 927
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
971 "--java-srcjars=$_rebased_java_srcjars", 977 "--java-srcjars=$_rebased_java_srcjars",
972 "--java-srcjars=@FileArg($_rebased_build_config:javac:srcjars)", 978 "--java-srcjars=@FileArg($_rebased_build_config:javac:srcjars)",
973 "--jar-excluded-classes=$_jar_excluded_patterns", 979 "--jar-excluded-classes=$_jar_excluded_patterns",
974 ] 980 ]
975 foreach(e, _manifest_entries) { 981 foreach(e, _manifest_entries) {
976 args += [ "--manifest-entry=" + e ] 982 args += [ "--manifest-entry=" + e ]
977 } 983 }
978 if (_chromium_code) { 984 if (_chromium_code) {
979 args += [ "--chromium-code=1" ] 985 args += [ "--chromium-code=1" ]
980 } 986 }
981 987 if (_enable_errorprone) {
988 deps += [ "//third_party/errorprone:chromium_errorprone" ]
989 args += [
990 "--use-errorprone-path",
991 "bin/chromium_errorprone",
992 ]
993 }
982 args += rebase_path(_java_files, root_build_dir) 994 args += rebase_path(_java_files, root_build_dir)
983 } 995 }
984 996
985 process_java_prebuilt(finish_target_name) { 997 process_java_prebuilt(finish_target_name) {
986 visibility = [ ":$final_target_name" ] 998 visibility = [ ":$final_target_name" ]
987 999
988 build_config = _build_config 1000 build_config = _build_config
989 input_jar_path = _intermediate_jar_path 1001 input_jar_path = _intermediate_jar_path
990 output_jar_path = _final_jar_path 1002 output_jar_path = _final_jar_path
991 if (defined(invoker.proguard_preprocess) && invoker.proguard_preprocess) { 1003 if (defined(invoker.proguard_preprocess) && invoker.proguard_preprocess) {
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
1121 _final_deps += [ ":$_compile_java_target" ] 1133 _final_deps += [ ":$_compile_java_target" ]
1122 compile_java(_compile_java_target) { 1134 compile_java(_compile_java_target) {
1123 jar_path = _jar_path 1135 jar_path = _jar_path
1124 build_config = _build_config 1136 build_config = _build_config
1125 java_files = _java_files 1137 java_files = _java_files
1126 srcjar_deps = _srcjar_deps 1138 srcjar_deps = _srcjar_deps
1127 srcjars = _srcjars 1139 srcjars = _srcjars
1128 chromium_code = _chromium_code 1140 chromium_code = _chromium_code
1129 android = _requires_android 1141 android = _requires_android
1130 1142
1143 if (defined(invoker.enable_errorprone)) {
1144 _enable_errorprone = invoker.enable_errorprone
1145 }
1131 if (defined(invoker.jar_excluded_patterns)) { 1146 if (defined(invoker.jar_excluded_patterns)) {
1132 jar_excluded_patterns = invoker.jar_excluded_patterns 1147 jar_excluded_patterns = invoker.jar_excluded_patterns
1133 } 1148 }
1134 if (defined(invoker.proguard_preprocess)) { 1149 if (defined(invoker.proguard_preprocess)) {
1135 proguard_preprocess = invoker.proguard_preprocess 1150 proguard_preprocess = invoker.proguard_preprocess
1136 } 1151 }
1137 if (defined(invoker.proguard_config)) { 1152 if (defined(invoker.proguard_config)) {
1138 proguard_config = invoker.proguard_config 1153 proguard_config = invoker.proguard_config
1139 } 1154 }
1140 if (defined(invoker.dist_jar_path)) { 1155 if (defined(invoker.dist_jar_path)) {
(...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after
1516 ] 1531 ]
1517 args = [ 1532 args = [
1518 "--depfile", 1533 "--depfile",
1519 rebase_path(depfile, root_build_dir), 1534 rebase_path(depfile, root_build_dir),
1520 "--script-output-path", 1535 "--script-output-path",
1521 rebase_path(generated_script, root_build_dir), 1536 rebase_path(generated_script, root_build_dir),
1522 ] 1537 ]
1523 args += test_runner_args 1538 args += test_runner_args
1524 } 1539 }
1525 } 1540 }
OLDNEW
« no previous file with comments | « build/config/android/config.gni ('k') | build/config/android/rules.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698