diff options
| author | cjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-12 15:10:38 +0000 |
|---|---|---|
| committer | cjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-12 15:11:51 +0000 |
| commit | c5e7f2bd2f39fa643bdbc7e6f752172c76ddd39d (patch) | |
| tree | 0adfba10025c26cc0a1ad22b22e1c1ae4400dbd0 /build/java.gypi | |
| parent | dd4fdd8f8d0e2da82658a8f062740fcf37ec9f06 (diff) | |
| download | chromium_src-c5e7f2bd2f39fa643bdbc7e6f752172c76ddd39d.zip chromium_src-c5e7f2bd2f39fa643bdbc7e6f752172c76ddd39d.tar.gz chromium_src-c5e7f2bd2f39fa643bdbc7e6f752172c76ddd39d.tar.bz2 | |
Update lint and findbugs to use jars instead of class files
Now that this is done, we don't need to leave the class files laying
around anymore. So don't.
Review URL: https://codereview.chromium.org/458653002
Cr-Commit-Position: refs/heads/master@{#288971}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288971 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/java.gypi')
| -rw-r--r-- | build/java.gypi | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/build/java.gypi b/build/java.gypi index 6f86030..bf6f56c 100644 --- a/build/java.gypi +++ b/build/java.gypi @@ -69,7 +69,6 @@ 'res_v14_verify_only%': 0, 'resource_input_paths': ['>@(res_extra_files)'], 'intermediate_dir': '<(SHARED_INTERMEDIATE_DIR)/<(_target_name)', - 'classes_dir': '<(intermediate_dir)/classes', 'compile_stamp': '<(intermediate_dir)/compile.stamp', 'lint_stamp': '<(intermediate_dir)/lint.stamp', 'lint_result': '<(intermediate_dir)/lint_result.xml', @@ -234,7 +233,6 @@ ], 'action': [ 'python', '<(DEPTH)/build/android/gyp/javac.py', - '--classes-dir=<(classes_dir)', '--classpath=>(input_jars_paths)', '--src-gendirs=>(generated_src_dirs)', '--javac-includes=<(javac_includes)', @@ -246,6 +244,23 @@ ] }, { + 'action_name': 'instr_jar_<(_target_name)', + 'message': 'Instrumenting <(_target_name) jar', + 'variables': { + 'input_path': '<(jar_path)', + 'output_path': '<(jar_final_path)', + 'stamp_path': '<(instr_stamp)', + 'instr_type': 'jar', + }, + 'outputs': [ + '<(jar_final_path)', + ], + 'inputs': [ + '<(jar_path)', + ], + 'includes': [ 'android/instr_action.gypi' ], + }, + { 'variables': { 'src_dirs': [ '<(java_in_dir)/src', @@ -254,8 +269,10 @@ 'stamp_path': '<(lint_stamp)', 'result_path': '<(lint_result)', 'config_path': '<(lint_config)', + 'lint_jar_path': '<(jar_final_path)', }, 'inputs': [ + '<(jar_final_path)', '<(compile_stamp)', ], 'outputs': [ @@ -264,23 +281,6 @@ 'includes': [ 'android/lint_action.gypi' ], }, { - 'action_name': 'instr_jar_<(_target_name)', - 'message': 'Instrumenting <(_target_name) jar', - 'variables': { - 'input_path': '<(jar_path)', - 'output_path': '<(jar_final_path)', - 'stamp_path': '<(instr_stamp)', - 'instr_type': 'jar', - }, - 'outputs': [ - '<(jar_final_path)', - ], - 'inputs': [ - '<(jar_path)', - ], - 'includes': [ 'android/instr_action.gypi' ], - }, - { 'action_name': 'jar_toc_<(_target_name)', 'message': 'Creating <(_target_name) jar.TOC', 'inputs': [ |