| 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 Android APKs in a consistent manner. | 6 # to build Android APKs 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_apk', | 10 #   'target_name': 'my_package_apk', | 
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 58     'additional_src_dirs': [], | 58     'additional_src_dirs': [], | 
| 59     'generated_src_dirs': [], | 59     'generated_src_dirs': [], | 
| 60     'app_manifest_version_name%': '<(android_app_version_name)', | 60     'app_manifest_version_name%': '<(android_app_version_name)', | 
| 61     'app_manifest_version_code%': '<(android_app_version_code)', | 61     'app_manifest_version_code%': '<(android_app_version_code)', | 
| 62     # aapt generates this proguard.txt. | 62     # aapt generates this proguard.txt. | 
| 63     'generated_proguard_file': '<(intermediate_dir)/proguard.txt', | 63     'generated_proguard_file': '<(intermediate_dir)/proguard.txt', | 
| 64     'proguard_enabled%': 'false', | 64     'proguard_enabled%': 'false', | 
| 65     'proguard_flags_paths': ['<(generated_proguard_file)'], | 65     'proguard_flags_paths': ['<(generated_proguard_file)'], | 
| 66     'jar_name': 'chromium_apk_<(_target_name).jar', | 66     'jar_name': 'chromium_apk_<(_target_name).jar', | 
| 67     'resource_dir%':'<(DEPTH)/build/android/ant/empty/res', | 67     'resource_dir%':'<(DEPTH)/build/android/ant/empty/res', | 
|  | 68     'res_v14_compatibility_dir': '<(intermediate_dir)/res_v14_compatibility', | 
| 68     'R_package%':'', | 69     'R_package%':'', | 
| 69     'additional_R_text_files': [], | 70     'additional_R_text_files': [], | 
| 70     'additional_res_dirs': [], | 71     'additional_res_dirs': [], | 
| 71     'additional_res_packages': [], | 72     'additional_res_packages': [], | 
| 72     'is_test_apk%': 0, | 73     'is_test_apk%': 0, | 
| 73     'resource_input_paths': [], | 74     'resource_input_paths': [], | 
| 74     'intermediate_dir': '<(PRODUCT_DIR)/<(_target_name)', | 75     'intermediate_dir': '<(PRODUCT_DIR)/<(_target_name)', | 
| 75     'asset_location%': '<(intermediate_dir)/assets', | 76     'asset_location%': '<(intermediate_dir)/assets', | 
| 76     'codegen_stamp': '<(intermediate_dir)/codegen.stamp', | 77     'codegen_stamp': '<(intermediate_dir)/codegen.stamp', | 
| 77     'package_input_paths': [], | 78     'package_input_paths': [], | 
| (...skipping 394 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 472 | 473 | 
| 473         '--android-manifest', '<(android_manifest_path)', | 474         '--android-manifest', '<(android_manifest_path)', | 
| 474         '--dependencies-res-dirs', '>(additional_res_dirs)', | 475         '--dependencies-res-dirs', '>(additional_res_dirs)', | 
| 475 | 476 | 
| 476         '--extra-res-packages', '>(additional_res_packages)', | 477         '--extra-res-packages', '>(additional_res_packages)', | 
| 477         '--extra-r-text-files', '>(additional_R_text_files)', | 478         '--extra-r-text-files', '>(additional_R_text_files)', | 
| 478 | 479 | 
| 479         '--proguard-file', '<(generated_proguard_file)', | 480         '--proguard-file', '<(generated_proguard_file)', | 
| 480 | 481 | 
| 481         '--resource-dir', '<(resource_dir)', | 482         '--resource-dir', '<(resource_dir)', | 
|  | 483         '--res-v14-compatibility-dir', '<(res_v14_compatibility_dir)', | 
| 482         '--crunch-output-dir', '<(crunch_output_dir)', | 484         '--crunch-output-dir', '<(crunch_output_dir)', | 
| 483 | 485 | 
| 484         '--R-dir', '<(intermediate_dir)/gen', | 486         '--R-dir', '<(intermediate_dir)/gen', | 
| 485 | 487 | 
| 486         '--stamp', '<(codegen_stamp)', | 488         '--stamp', '<(codegen_stamp)', | 
| 487       ], | 489       ], | 
| 488     }, | 490     }, | 
| 489     { | 491     { | 
| 490       'action_name': 'javac_<(_target_name)', | 492       'action_name': 'javac_<(_target_name)', | 
| 491       'message': 'Compiling java for <(_target_name)', | 493       'message': 'Compiling java for <(_target_name)', | 
| (...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 743         '-DEMMA_INSTRUMENT=<(emma_instrument)', | 745         '-DEMMA_INSTRUMENT=<(emma_instrument)', | 
| 744         '-DEMMA_DEVICE_JAR=<(emma_device_jar)', | 746         '-DEMMA_DEVICE_JAR=<(emma_device_jar)', | 
| 745 | 747 | 
| 746         '-Dbasedir=.', | 748         '-Dbasedir=.', | 
| 747         '-buildfile', | 749         '-buildfile', | 
| 748         '<(DEPTH)/build/android/ant/apk-package.xml', | 750         '<(DEPTH)/build/android/ant/apk-package.xml', | 
| 749       ] | 751       ] | 
| 750     }, | 752     }, | 
| 751   ], | 753   ], | 
| 752 } | 754 } | 
| OLD | NEW | 
|---|