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

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: Using the Compiler Created 5 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
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 701 matching lines...) Expand 10 before | Expand all | Expand 10 after
712 712
713 _jar_excluded_patterns = [] 713 _jar_excluded_patterns = []
714 if (defined(invoker.jar_excluded_patterns)) { 714 if (defined(invoker.jar_excluded_patterns)) {
715 _jar_excluded_patterns += invoker.jar_excluded_patterns 715 _jar_excluded_patterns += invoker.jar_excluded_patterns
716 } 716 }
717 717
718 _chromium_code = false 718 _chromium_code = false
719 if (defined(invoker.chromium_code)) { 719 if (defined(invoker.chromium_code)) {
720 _chromium_code = invoker.chromium_code 720 _chromium_code = invoker.chromium_code
721 } 721 }
722
723 _disable_errorprone = false
724 if (defined(invoker.disable_errorprone)) {
725 _disable_errorprone = invoker.disable_errorprone
726 }
727
722 _manifest_entries = [] 728 _manifest_entries = []
723 if (defined(invoker.manifest_entries)) { 729 if (defined(invoker.manifest_entries)) {
724 _manifest_entries = invoker.manifest_entries 730 _manifest_entries = invoker.manifest_entries
725 } 731 }
726 732
727 _srcjar_deps = [] 733 _srcjar_deps = []
728 if (defined(invoker.srcjar_deps)) { 734 if (defined(invoker.srcjar_deps)) {
729 _srcjar_deps += invoker.srcjar_deps 735 _srcjar_deps += invoker.srcjar_deps
730 } 736 }
731 737
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
775 "--java-srcjars=$_rebased_java_srcjars", 781 "--java-srcjars=$_rebased_java_srcjars",
776 "--java-srcjars=@FileArg($_rebased_build_config:javac:srcjars)", 782 "--java-srcjars=@FileArg($_rebased_build_config:javac:srcjars)",
777 "--jar-excluded-classes=$_jar_excluded_patterns", 783 "--jar-excluded-classes=$_jar_excluded_patterns",
778 ] 784 ]
779 foreach(e, _manifest_entries) { 785 foreach(e, _manifest_entries) {
780 args += [ "--manifest-entry=" + e ] 786 args += [ "--manifest-entry=" + e ]
781 } 787 }
782 if (_chromium_code) { 788 if (_chromium_code) {
783 args += [ "--chromium-code=1" ] 789 args += [ "--chromium-code=1" ]
784 } 790 }
785 791 if (_disable_errorprone) {
792 args += [ "--disable-errorprone" ]
793 } else {
794 deps += [ "//third_party/errorprone:chromium_errorprone" ]
795 args += [
796 "--errorprone-path",
797 "bin/chromium_errorprone",
798 ]
799 }
786 args += rebase_path(_java_files, root_build_dir) 800 args += rebase_path(_java_files, root_build_dir)
787 } 801 }
788 802
789 _final_deps += [ ":${_template_name}__finish" ] 803 _final_deps += [ ":${_template_name}__finish" ]
790 process_java_prebuilt("${_template_name}__finish") { 804 process_java_prebuilt("${_template_name}__finish") {
791 build_config = _build_config 805 build_config = _build_config
792 input_jar_path = _intermediate_jar_path 806 input_jar_path = _intermediate_jar_path
793 output_jar_path = _final_jar_path 807 output_jar_path = _final_jar_path
794 if (defined(invoker.proguard_preprocess) && invoker.proguard_preprocess) { 808 if (defined(invoker.proguard_preprocess) && invoker.proguard_preprocess) {
795 proguard_preprocess = invoker.proguard_preprocess 809 proguard_preprocess = invoker.proguard_preprocess
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
903 _final_deps += [ ":${_template_name}__compile_java" ] 917 _final_deps += [ ":${_template_name}__compile_java" ]
904 compile_java("${_template_name}__compile_java") { 918 compile_java("${_template_name}__compile_java") {
905 jar_path = _jar_path 919 jar_path = _jar_path
906 build_config = _build_config 920 build_config = _build_config
907 java_files = _java_files 921 java_files = _java_files
908 srcjar_deps = _srcjar_deps 922 srcjar_deps = _srcjar_deps
909 srcjars = _srcjars 923 srcjars = _srcjars
910 chromium_code = _chromium_code 924 chromium_code = _chromium_code
911 android = _requires_android 925 android = _requires_android
912 926
927 if (defined(invoker.disable_errorprone)) {
928 disable_errorprone = invoker.disable_errorprone
929 }
913 if (defined(invoker.jar_excluded_patterns)) { 930 if (defined(invoker.jar_excluded_patterns)) {
914 jar_excluded_patterns = invoker.jar_excluded_patterns 931 jar_excluded_patterns = invoker.jar_excluded_patterns
915 } 932 }
916 if (defined(invoker.proguard_preprocess)) { 933 if (defined(invoker.proguard_preprocess)) {
917 proguard_preprocess = invoker.proguard_preprocess 934 proguard_preprocess = invoker.proguard_preprocess
918 } 935 }
919 if (defined(invoker.proguard_config)) { 936 if (defined(invoker.proguard_config)) {
920 proguard_config = invoker.proguard_config 937 proguard_config = invoker.proguard_config
921 } 938 }
922 if (defined(invoker.dist_jar_path)) { 939 if (defined(invoker.dist_jar_path)) {
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
1154 ] 1171 ]
1155 output = invoker.dex_path 1172 output = invoker.dex_path
1156 dex_arg_key = "${rebased_build_config}:final_dex:dependency_dex_files" 1173 dex_arg_key = "${rebased_build_config}:final_dex:dependency_dex_files"
1157 args = [ "--inputs=@FileArg($dex_arg_key)" ] 1174 args = [ "--inputs=@FileArg($dex_arg_key)" ]
1158 if (defined(invoker.excluded_jars)) { 1175 if (defined(invoker.excluded_jars)) {
1159 excluded_jars = rebase_path(invoker.excluded_jars, root_build_dir) 1176 excluded_jars = rebase_path(invoker.excluded_jars, root_build_dir)
1160 args += [ "--excluded-paths=${excluded_jars}" ] 1177 args += [ "--excluded-paths=${excluded_jars}" ]
1161 } 1178 }
1162 } 1179 }
1163 } 1180 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698