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

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: Rebase and parser 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
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 777 matching lines...) Expand 10 before | Expand all | Expand 10 after
788 788
789 _jar_excluded_patterns = [] 789 _jar_excluded_patterns = []
790 if (defined(invoker.jar_excluded_patterns)) { 790 if (defined(invoker.jar_excluded_patterns)) {
791 _jar_excluded_patterns += invoker.jar_excluded_patterns 791 _jar_excluded_patterns += invoker.jar_excluded_patterns
792 } 792 }
793 793
794 _chromium_code = false 794 _chromium_code = false
795 if (defined(invoker.chromium_code)) { 795 if (defined(invoker.chromium_code)) {
796 _chromium_code = invoker.chromium_code 796 _chromium_code = invoker.chromium_code
797 } 797 }
798
799 _enable_errorprone = use_errorprone_java_compiler
800 if (defined(invoker.enable_errorprone)) {
801 _enable_errorprone = invoker.enable_errorprone
802 }
803
798 _manifest_entries = [] 804 _manifest_entries = []
799 if (defined(invoker.manifest_entries)) { 805 if (defined(invoker.manifest_entries)) {
800 _manifest_entries = invoker.manifest_entries 806 _manifest_entries = invoker.manifest_entries
801 } 807 }
802 808
803 _srcjar_deps = [] 809 _srcjar_deps = []
804 if (defined(invoker.srcjar_deps)) { 810 if (defined(invoker.srcjar_deps)) {
805 _srcjar_deps += invoker.srcjar_deps 811 _srcjar_deps += invoker.srcjar_deps
806 } 812 }
807 813
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
851 "--java-srcjars=$_rebased_java_srcjars", 857 "--java-srcjars=$_rebased_java_srcjars",
852 "--java-srcjars=@FileArg($_rebased_build_config:javac:srcjars)", 858 "--java-srcjars=@FileArg($_rebased_build_config:javac:srcjars)",
853 "--jar-excluded-classes=$_jar_excluded_patterns", 859 "--jar-excluded-classes=$_jar_excluded_patterns",
854 ] 860 ]
855 foreach(e, _manifest_entries) { 861 foreach(e, _manifest_entries) {
856 args += [ "--manifest-entry=" + e ] 862 args += [ "--manifest-entry=" + e ]
857 } 863 }
858 if (_chromium_code) { 864 if (_chromium_code) {
859 args += [ "--chromium-code=1" ] 865 args += [ "--chromium-code=1" ]
860 } 866 }
861 867 if (_enable_errorprone) {
868 deps += [ "//third_party/errorprone:chromium_errorprone" ]
869 args += [
870 "--use-errorprone-path",
871 "bin/chromium_errorprone",
872 ]
873 }
862 args += rebase_path(_java_files, root_build_dir) 874 args += rebase_path(_java_files, root_build_dir)
863 } 875 }
864 876
865 _final_deps += [ ":${_template_name}__finish" ] 877 _final_deps += [ ":${_template_name}__finish" ]
866 process_java_prebuilt("${_template_name}__finish") { 878 process_java_prebuilt("${_template_name}__finish") {
867 build_config = _build_config 879 build_config = _build_config
868 input_jar_path = _intermediate_jar_path 880 input_jar_path = _intermediate_jar_path
869 output_jar_path = _final_jar_path 881 output_jar_path = _final_jar_path
870 if (defined(invoker.proguard_preprocess) && invoker.proguard_preprocess) { 882 if (defined(invoker.proguard_preprocess) && invoker.proguard_preprocess) {
871 proguard_preprocess = invoker.proguard_preprocess 883 proguard_preprocess = invoker.proguard_preprocess
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
979 _final_deps += [ ":${_template_name}__compile_java" ] 991 _final_deps += [ ":${_template_name}__compile_java" ]
980 compile_java("${_template_name}__compile_java") { 992 compile_java("${_template_name}__compile_java") {
981 jar_path = _jar_path 993 jar_path = _jar_path
982 build_config = _build_config 994 build_config = _build_config
983 java_files = _java_files 995 java_files = _java_files
984 srcjar_deps = _srcjar_deps 996 srcjar_deps = _srcjar_deps
985 srcjars = _srcjars 997 srcjars = _srcjars
986 chromium_code = _chromium_code 998 chromium_code = _chromium_code
987 android = _requires_android 999 android = _requires_android
988 1000
1001 if (defined(invoker.enable_errorprone)) {
1002 _enable_errorprone = invoker.enable_errorprone
1003 }
989 if (defined(invoker.jar_excluded_patterns)) { 1004 if (defined(invoker.jar_excluded_patterns)) {
990 jar_excluded_patterns = invoker.jar_excluded_patterns 1005 jar_excluded_patterns = invoker.jar_excluded_patterns
991 } 1006 }
992 if (defined(invoker.proguard_preprocess)) { 1007 if (defined(invoker.proguard_preprocess)) {
993 proguard_preprocess = invoker.proguard_preprocess 1008 proguard_preprocess = invoker.proguard_preprocess
994 } 1009 }
995 if (defined(invoker.proguard_config)) { 1010 if (defined(invoker.proguard_config)) {
996 proguard_config = invoker.proguard_config 1011 proguard_config = invoker.proguard_config
997 } 1012 }
998 if (defined(invoker.dist_jar_path)) { 1013 if (defined(invoker.dist_jar_path)) {
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
1290 script = "//build/android/gyp/generate_split_manifest.py" 1305 script = "//build/android/gyp/generate_split_manifest.py"
1291 outputs = [ 1306 outputs = [
1292 depfile, 1307 depfile,
1293 invoker.out_manifest, 1308 invoker.out_manifest,
1294 ] 1309 ]
1295 inputs = [ 1310 inputs = [
1296 invoker.main_manifest, 1311 invoker.main_manifest,
1297 ] 1312 ]
1298 } 1313 }
1299 } 1314 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698