| Index: build/java.gypi
|
| diff --git a/build/java.gypi b/build/java.gypi
|
| index 6f860300ad7f967fc2d3b5fc3191f9490a3d720c..bf6f56c8ed9542d5d73a44de7b801a8740446015 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': [
|
|
|