| 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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   51 #    target. |   51 #    target. | 
|   52  |   52  | 
|   53 { |   53 { | 
|   54   'variables': { |   54   'variables': { | 
|   55     'asset_location%': '', |   55     'asset_location%': '', | 
|   56     'additional_input_paths': [], |   56     'additional_input_paths': [], | 
|   57     'input_jars_paths': [], |   57     'input_jars_paths': [], | 
|   58     'native_libs_paths': [], |   58     'native_libs_paths': [], | 
|   59     'additional_src_dirs': [], |   59     'additional_src_dirs': [], | 
|   60     'generated_src_dirs': [], |   60     'generated_src_dirs': [], | 
 |   61     'app_manifest_version_name%': '<(android_app_version_name)', | 
 |   62     'app_manifest_version_code%': '<(android_app_version_code)', | 
 |   63     'proguard_enabled%': 'false', | 
 |   64     'proguard_flags%': '' | 
|   61   }, |   65   }, | 
|   62   'actions': [ |   66   'actions': [ | 
|   63     { |   67     { | 
|   64       'action_name': 'ant_<(package_name)_apk', |   68       'action_name': 'ant_<(package_name)_apk', | 
|   65       'message': 'Building <(package_name) apk.', |   69       'message': 'Building <(package_name) apk.', | 
|   66       'inputs': [ |   70       'inputs': [ | 
|   67         '<(java_in_dir)/AndroidManifest.xml', |   71         '<(java_in_dir)/AndroidManifest.xml', | 
|   68         '<(DEPTH)/build/android/ant/chromium-apk.xml', |   72         '<(DEPTH)/build/android/ant/chromium-apk.xml', | 
|   69         '<(DEPTH)/build/android/ant/common.xml', |   73         '<(DEPTH)/build/android/ant/common.xml', | 
|   70         '<(DEPTH)/build/android/ant/sdk-targets.xml', |   74         '<(DEPTH)/build/android/ant/sdk-targets.xml', | 
| (...skipping 23 matching lines...) Expand all  Loading... | 
|   94         '-DCONFIGURATION_NAME=<(CONFIGURATION_NAME)', |   98         '-DCONFIGURATION_NAME=<(CONFIGURATION_NAME)', | 
|   95         '-DPRODUCT_DIR=<(ant_build_out)', |   99         '-DPRODUCT_DIR=<(ant_build_out)', | 
|   96  |  100  | 
|   97         '-DAPK_NAME=<(apk_name)', |  101         '-DAPK_NAME=<(apk_name)', | 
|   98         '-DASSET_DIR=<(asset_location)', |  102         '-DASSET_DIR=<(asset_location)', | 
|   99         '-DADDITIONAL_SRC_DIRS=>(additional_src_dirs)', |  103         '-DADDITIONAL_SRC_DIRS=>(additional_src_dirs)', | 
|  100         '-DGENERATED_SRC_DIRS=>(generated_src_dirs)', |  104         '-DGENERATED_SRC_DIRS=>(generated_src_dirs)', | 
|  101         '-DINPUT_JARS_PATHS=>(input_jars_paths)', |  105         '-DINPUT_JARS_PATHS=>(input_jars_paths)', | 
|  102         '-DPACKAGE_NAME=<(package_name)', |  106         '-DPACKAGE_NAME=<(package_name)', | 
|  103         '-DRESOURCE_DIR=<(resource_dir)', |  107         '-DRESOURCE_DIR=<(resource_dir)', | 
 |  108         '-DAPP_MANIFEST_VERSION_NAME=<(app_manifest_version_name)', | 
 |  109         '-DAPP_MANIFEST_VERSION_CODE=<(app_manifest_version_code)', | 
 |  110         '-DPROGUARD_FLAGS=>(proguard_flags)', | 
 |  111         '-DPROGUARD_ENABLED=>(proguard_enabled)', | 
|  104  |  112  | 
|  105         '-Dbasedir=<(java_in_dir)', |  113         '-Dbasedir=<(java_in_dir)', | 
|  106         '-buildfile', |  114         '-buildfile', | 
|  107         '<(DEPTH)/build/android/ant/chromium-apk.xml', |  115         '<(DEPTH)/build/android/ant/chromium-apk.xml', | 
|  108  |  116  | 
|  109         # Specify CONFIGURATION_NAME as the target for ant to build. The |  117         # Specify CONFIGURATION_NAME as the target for ant to build. The | 
|  110         # buildfile will then build the appropriate SDK tools target. |  118         # buildfile will then build the appropriate SDK tools target. | 
|  111         '<(CONFIGURATION_NAME)', |  119         '<(CONFIGURATION_NAME)', | 
|  112       ] |  120       ] | 
|  113     }, |  121     }, | 
|  114   ], |  122   ], | 
|  115 } |  123 } | 
| OLD | NEW |