| OLD | NEW | 
|---|
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 # This file is meant to be included into a target to provide a rule | 5 # This file is meant to be included into a target to provide a rule | 
| 6 # to build Java in a consistent manner. | 6 # to build Java in a consistent manner. | 
| 7 # | 7 # | 
| 8 # To use this, create a gyp target with the following form: | 8 # To use this, create a gyp target with the following form: | 
| 9 # { | 9 # { | 
| 10 #   'target_name': 'my-package_java', | 10 #   'target_name': 'my-package_java', | 
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 58     'jar_path': '<(PRODUCT_DIR)/lib.java/<(jar_name)', | 58     'jar_path': '<(PRODUCT_DIR)/lib.java/<(jar_name)', | 
| 59     'jar_excluded_classes': [ '*/R.class', '*/R##*.class' ], | 59     'jar_excluded_classes': [ '*/R.class', '*/R##*.class' ], | 
| 60     'additional_input_paths': [], | 60     'additional_input_paths': [], | 
| 61     'dex_path': '<(PRODUCT_DIR)/lib.java/<(_target_name).dex.jar', | 61     'dex_path': '<(PRODUCT_DIR)/lib.java/<(_target_name).dex.jar', | 
| 62     'generated_src_dirs': ['>@(generated_R_dirs)'], | 62     'generated_src_dirs': ['>@(generated_R_dirs)'], | 
| 63     'generated_R_dirs': [], | 63     'generated_R_dirs': [], | 
| 64     'has_java_resources%': 0, | 64     'has_java_resources%': 0, | 
| 65     'java_strings_grd%': '', | 65     'java_strings_grd%': '', | 
| 66     'res_extra_dirs': [], | 66     'res_extra_dirs': [], | 
| 67     'res_extra_files': [], | 67     'res_extra_files': [], | 
|  | 68     'res_v14_verify_only%': 0, | 
| 68     'resource_input_paths': ['>@(res_extra_files)'], | 69     'resource_input_paths': ['>@(res_extra_files)'], | 
| 69     'intermediate_dir': '<(SHARED_INTERMEDIATE_DIR)/<(_target_name)', | 70     'intermediate_dir': '<(SHARED_INTERMEDIATE_DIR)/<(_target_name)', | 
| 70     'classes_dir': '<(intermediate_dir)/classes', | 71     'classes_dir': '<(intermediate_dir)/classes', | 
| 71     'compile_stamp': '<(intermediate_dir)/compile.stamp', | 72     'compile_stamp': '<(intermediate_dir)/compile.stamp', | 
| 72   }, | 73   }, | 
| 73   # This all_dependent_settings is used for java targets only. This will add the | 74   # This all_dependent_settings is used for java targets only. This will add the | 
| 74   # jar path to the classpath of dependent java targets. | 75   # jar path to the classpath of dependent java targets. | 
| 75   'all_dependent_settings': { | 76   'all_dependent_settings': { | 
| 76     'variables': { | 77     'variables': { | 
| 77       'input_jars_paths': ['<(jar_path)'], | 78       'input_jars_paths': ['<(jar_path)'], | 
| (...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 178             # Add hash of inputs to the command line, so if inputs change | 179             # Add hash of inputs to the command line, so if inputs change | 
| 179             # (e.g. if a resource if removed), the command will be re-run. | 180             # (e.g. if a resource if removed), the command will be re-run. | 
| 180             # TODO(newt): remove this once crbug.com/177552 is fixed in ninja. | 181             # TODO(newt): remove this once crbug.com/177552 is fixed in ninja. | 
| 181             '--ignore=>!(echo \'>(_inputs)\' | md5sum)', | 182             '--ignore=>!(echo \'>(_inputs)\' | md5sum)', | 
| 182           ], | 183           ], | 
| 183         }, | 184         }, | 
| 184         # Generate API 14 resources. | 185         # Generate API 14 resources. | 
| 185         { | 186         { | 
| 186           'action_name': 'generate_api_14_resources_<(_target_name)', | 187           'action_name': 'generate_api_14_resources_<(_target_name)', | 
| 187           'message': 'Generating Android API 14 resources <(_target_name)', | 188           'message': 'Generating Android API 14 resources <(_target_name)', | 
|  | 189           'variables' : { | 
|  | 190             'res_v14_additional_options': [], | 
|  | 191           }, | 
|  | 192           'conditions': [ | 
|  | 193             ['res_v14_verify_only == 1', { | 
|  | 194               'variables': { | 
|  | 195                 'res_v14_additional_options': ['--verify-only'] | 
|  | 196               }, | 
|  | 197             }], | 
|  | 198           ], | 
| 188           'inputs': [ | 199           'inputs': [ | 
| 189             '<(DEPTH)/build/android/gyp/util/build_utils.py', | 200             '<(DEPTH)/build/android/gyp/util/build_utils.py', | 
| 190             '<(DEPTH)/build/android/gyp/generate_v14_compatible_resources.py', | 201             '<(DEPTH)/build/android/gyp/generate_v14_compatible_resources.py', | 
| 191             '>@(resource_input_paths)', | 202             '>@(resource_input_paths)', | 
| 192           ], | 203           ], | 
| 193           'outputs': [ | 204           'outputs': [ | 
| 194             '<(res_v14_compatibility_stamp)', | 205             '<(res_v14_compatibility_stamp)', | 
| 195           ], | 206           ], | 
| 196           'action': [ | 207           'action': [ | 
| 197             'python', '<(DEPTH)/build/android/gyp/generate_v14_compatible_resour
     ces.py', | 208             'python', '<(DEPTH)/build/android/gyp/generate_v14_compatible_resour
     ces.py', | 
| 198             '--res-dir=<(res_dir)', | 209             '--res-dir=<(res_dir)', | 
| 199             '--res-v14-compatibility-dir=<(res_v14_compatibility_dir)', | 210             '--res-v14-compatibility-dir=<(res_v14_compatibility_dir)', | 
| 200             '--stamp', '<(res_v14_compatibility_stamp)', | 211             '--stamp', '<(res_v14_compatibility_stamp)', | 
|  | 212             '<@(res_v14_additional_options)', | 
| 201           ] | 213           ] | 
| 202         }, | 214         }, | 
| 203       ], | 215       ], | 
| 204     }], | 216     }], | 
| 205   ], | 217   ], | 
| 206   'actions': [ | 218   'actions': [ | 
| 207     { | 219     { | 
| 208       'action_name': 'javac_<(_target_name)', | 220       'action_name': 'javac_<(_target_name)', | 
| 209       'message': 'Compiling <(_target_name) java sources', | 221       'message': 'Compiling <(_target_name) java sources', | 
| 210       'variables': { | 222       'variables': { | 
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 283     { | 295     { | 
| 284       'action_name': 'dex_<(_target_name)', | 296       'action_name': 'dex_<(_target_name)', | 
| 285       'variables': { | 297       'variables': { | 
| 286         'dex_input_paths': [ '<(jar_path)' ], | 298         'dex_input_paths': [ '<(jar_path)' ], | 
| 287         'output_path': '<(dex_path)', | 299         'output_path': '<(dex_path)', | 
| 288       }, | 300       }, | 
| 289       'includes': [ 'android/dex_action.gypi' ], | 301       'includes': [ 'android/dex_action.gypi' ], | 
| 290     }, | 302     }, | 
| 291   ], | 303   ], | 
| 292 } | 304 } | 
| OLD | NEW | 
|---|