Index: build/java_apk.gypi |
diff --git a/build/java_apk.gypi b/build/java_apk.gypi |
index 979f4498cdfd66a76c524dd7adea2c5036689849..5ca61e3794e32e4f6ce9b2d08599875e557979ff 100644 |
--- a/build/java_apk.gypi |
+++ b/build/java_apk.gypi |
@@ -53,6 +53,7 @@ |
# enable_content_linker_tests - Enable the content dynamic linker test support |
# code. This allows a test APK to inject a Linker.TestRunner instance at |
# runtime. Should only be used by the content_linker_test_apk target!! |
+# never_lint - Set to 1 to not run lint on this target. |
{ |
'variables': { |
'additional_input_paths': [], |
@@ -91,6 +92,10 @@ |
'native_libraries_template_data_file': '<(native_libraries_template_data_dir)/native_libraries_array.h', |
'native_libraries_template_version_file': '<(native_libraries_template_data_dir)/native_libraries_version.h', |
'compile_stamp': '<(intermediate_dir)/compile.stamp', |
+ 'lint_stamp': '<(intermediate_dir)/lint.stamp', |
+ 'lint_result': '<(intermediate_dir)/lint_result.xml', |
+ 'lint_config': '<(intermediate_dir)/lint_config.xml', |
+ 'never_lint%': 0, |
'instr_stamp': '<(intermediate_dir)/instr.stamp', |
'jar_stamp': '<(intermediate_dir)/jar.stamp', |
'obfuscate_stamp': '<(intermediate_dir)/obfuscate.stamp', |
@@ -552,6 +557,24 @@ |
], |
}, |
{ |
+ 'variables': { |
+ 'src_dirs': [ |
+ '<(java_in_dir)/src', |
+ '>@(additional_src_dirs)', |
+ ], |
+ 'stamp_path': '<(lint_stamp)', |
+ 'result_path': '<(lint_result)', |
+ 'config_path': '<(lint_config)', |
+ }, |
+ 'inputs': [ |
+ '<(compile_stamp)', |
+ ], |
+ 'outputs': [ |
+ '<(lint_stamp)', |
+ ], |
+ 'includes': [ 'android/lint_action.gypi' ], |
+ }, |
+ { |
'action_name': 'instr_classes_<(_target_name)', |
'message': 'Instrumenting <(_target_name) classes', |
'variables': { |
@@ -560,12 +583,12 @@ |
'stamp_path': '<(instr_stamp)', |
'instr_type': 'classes', |
}, |
- 'outputs': [ |
- '<(instr_stamp)', |
- ], |
'inputs': [ |
'<(compile_stamp)', |
], |
+ 'outputs': [ |
+ '<(instr_stamp)', |
+ ], |
'includes': [ 'android/instr_action.gypi' ], |
}, |
{ |