Use the Errorprone Compiler

build/java_apk.gypi

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This file is meant to be included into a target to provide a rule
 # to build Android APKs in a consistent manner.
 #
 # To use this, create a gyp target with the following form:
 # {
 #   'target_name': 'my_package_apk',
@@ skipping 162 matching lines @@
     'load_library_from_zip_file%' : 0,
     'use_relocation_packer%' : 0,
     'enable_chromium_linker_tests%': 0,
     'emma_instrument%': '<(emma_instrument)',
     'apk_package_native_libs_dir': '<(apk_package_native_libs_dir)',
     'unsigned_standalone_apk_path': '<(unsigned_standalone_apk_path)',
     'libchromium_android_linker': 'libchromium_android_linker.>(android_product_extension)',
     'extra_native_libs': [],
     'native_lib_placeholder_stamp': '<(apk_package_native_libs_dir)/<(android_app_abi)/native_lib_placeholder.stamp',
     'native_lib_placeholders': [],
+    'disable_errorprone%': '0',

[jbudorick, 2015/05/07 18:49:27]

If errorprone is enabled, this should add the errorprone gyp target as a
dependency.

[raywilliams_chromium, 2015/05/11 19:52:25]

added the condition

[raywilliams_chromium, 2015/05/11 19:52:25]

Done.

+    'errorprone_exe_path': '<(PRODUCT_DIR)/bin.java/chromium_errorprone',
   },
   # Pass the jar path to the apk's "fake" jar target.  This would be better as
   # direct_dependent_settings, but a variable set by a direct_dependent_settings
   # cannot be lifted in a dependent to all_dependent_settings.
   'all_dependent_settings': {
     'conditions': [
       ['proguard_enabled == "true"', {
         'variables': {
           'proguard_enabled': 'true',
         }
@@ skipping 468 matching lines @@
         # wrong .java files when additional_src_dirs is empty.
         # TODO(thakis): Gyp caches >! evaluation by command. Both java.gypi and
         # java_apk.gypi evaluate the same command, and at the moment two targets
         # set java_in_dir to "java". Add a dummy comment here to make sure
         # that the two targets (one uses java.gypi, the other java_apk.gypi)
         # get distinct source lists. Medium-term, make targets list all their
         # Java files instead of using find. (As is, this will be broken if two
         # targets use the same java_in_dir and both use java_apk.gypi or
         # both use java.gypi.)
         'java_sources': ['>!@(find >(java_in_dir)>(java_in_dir_suffix) >(additional_src_dirs) -name "*.java"  # apk)'],
-
+        'conditions': [
+          ['disable_errorprone == 0', {
+            'extra_inputs': [
+              '<(errorprone_exe_path)',
+            ],
+            'extra_args': [ '--errorprone-path=<(errorprone_exe_path)' ],
+          }, {
+            'extra_inputs': [],
+            'extra_args': [ '--disable-errorprone' ],
+          }],
+        ],
       },
       'inputs': [
         '<(DEPTH)/build/android/gyp/util/build_utils.py',
         '<(DEPTH)/build/android/gyp/javac.py',
         '>@(java_sources)',
         '>@(input_jars_paths)',
         '<(codegen_stamp)',
+        '<@(extra_inputs)',
       ],
       'conditions': [
         ['native_lib_target != ""', {
           'inputs': [ '<(native_libraries_java_stamp)' ],
         }],
       ],
       'outputs': [
         '<(compile_stamp)',
         '<(javac_jar_path)',
       ],
       'action': [
         'python', '<(DEPTH)/build/android/gyp/javac.py',
         '--classpath=>(input_jars_paths) <(android_sdk_jar)',
         '--src-gendirs=>(gen_src_dirs)',
         '--javac-includes=<(javac_includes)',
         '--chromium-code=<(chromium_code)',
         '--jar-path=<(javac_jar_path)',
         '--jar-excluded-classes=<(jar_excluded_classes)',
         '--stamp=<(compile_stamp)',
+        '<@(extra_args)',
         '>@(java_sources)',
       ],
     },
     {
       'action_name': 'instr_jar_<(_target_name)',
       'message': 'Instrumenting <(_target_name) jar',
       'variables': {
         'input_path': '<(javac_jar_path)',
         'output_path': '<(jar_path)',
         'stamp_path': '<(instr_stamp)',
@@ skipping 91 matching lines @@
 
         '--configuration-name', '<(CONFIGURATION_NAME)',
 
         '--android-sdk', '<(android_sdk)',
         '--android-sdk-tools', '<(android_sdk_tools)',
         '--android-sdk-jar', '<(android_sdk_jar)',
 
         '--input-jars-paths=>(proguard_input_jar_paths)',
         '--proguard-configs=>(proguard_flags_paths)',
 
+
         '--test-jar-path', '<(test_jar_path)',
         '--obfuscated-jar-path', '<(obfuscated_jar_path)',
 
         '--proguard-jar-path', '<(android_sdk_root)/tools/proguard/lib/proguard.jar',
 
         '--stamp', '<(obfuscate_stamp)',
 
         '>@(additional_obfuscate_options)',
       ],
     },
@@ skipping 134 matching lines @@
         '-DEMMA_INSTRUMENT=<(emma_instrument)',
         '-DEMMA_DEVICE_JAR=<(emma_device_jar)',
 
         '-Dbasedir=.',
         '-buildfile',
         '<(DEPTH)/build/android/ant/apk-package.xml',
       ]
     },
   ],
 }