| OLD | NEW | 
|---|
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 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 an action to provide an action that | 5 # This file is meant to be included into an action to provide an action that | 
| 6 # signs and zipaligns an APK. | 6 # signs and zipaligns an APK. | 
| 7 # | 7 # | 
| 8 # To use this, create a gyp action with the following form: | 8 # To use this, create a gyp action with the following form: | 
| 9 #  { | 9 #  { | 
| 10 #    'action_name': 'some descriptive action name', | 10 #    'action_name': 'some descriptive action name', | 
| 11 #    'variables': { | 11 #    'variables': { | 
| 12 #      'input_apk_path': 'relative/path/to/input.apk', | 12 #      'input_apk_path': 'relative/path/to/input.apk', | 
| 13 #      'output_apk_path': 'relative/path/to/output.apk', | 13 #      'output_apk_path': 'relative/path/to/output.apk', | 
| 14 #    }, | 14 #    }, | 
| 15 #    'includes': [ '../../build/android/finalize_apk_action.gypi' ], | 15 #    'includes': [ '../../build/android/finalize_apk_action.gypi' ], | 
| 16 #  }, | 16 #  }, | 
| 17 # | 17 # | 
| 18 | 18 | 
| 19 { | 19 { | 
| 20   'message': 'Signing/aligning <(_target_name) APK: <(input_apk_path)', | 20   'message': 'Signing/aligning <(_target_name) APK: <(input_apk_path)', | 
| 21   'variables': { | 21   'variables': { | 
| 22     'keystore_path%': '<(DEPTH)/build/android/ant/chromium-debug.keystore', | 22     'keystore_path%': '<(DEPTH)/build/android/ant/chromium-debug.keystore', | 
| 23     'keystore_name%': 'chromiumdebugkey', | 23     'keystore_name%': 'chromiumdebugkey', | 
| 24     'keystore_password%': 'chromium', | 24     'keystore_password%': 'chromium', | 
| 25     'conditions': [ | 25     'zipalign_path%': '<(android_sdk_tools)/zipalign', | 
| 26         # Webview doesn't use zipalign or rezip_apk_jar. | 26     'rezip_apk_jar_path%': '<(PRODUCT_DIR)/lib.java/rezip_apk.jar', | 
| 27         ['android_webview_build==0', { |  | 
| 28           'zipalign_path%': '<(android_sdk_tools)/zipalign', |  | 
| 29           'rezip_apk_jar_path%': '<(PRODUCT_DIR)/lib.java/rezip_apk.jar' |  | 
| 30         }, { |  | 
| 31           'zipalign_path%': "", |  | 
| 32           'rezip_apk_jar_path%': "", |  | 
| 33         }], |  | 
| 34     ], |  | 
| 35   }, | 27   }, | 
| 36   'inputs': [ | 28   'inputs': [ | 
| 37     '<(DEPTH)/build/android/gyp/finalize_apk.py', | 29     '<(DEPTH)/build/android/gyp/finalize_apk.py', | 
| 38     '<(DEPTH)/build/android/gyp/util/build_utils.py', | 30     '<(DEPTH)/build/android/gyp/util/build_utils.py', | 
| 39     '<(keystore_path)', | 31     '<(keystore_path)', | 
| 40     '<(input_apk_path)', | 32     '<(input_apk_path)', | 
| 41   ], | 33   ], | 
| 42   'outputs': [ | 34   'outputs': [ | 
| 43     '<(output_apk_path)', | 35     '<(output_apk_path)', | 
| 44   ], | 36   ], | 
| 45   'action': [ | 37   'action': [ | 
| 46     'python', '<(DEPTH)/build/android/gyp/finalize_apk.py', | 38     'python', '<(DEPTH)/build/android/gyp/finalize_apk.py', | 
| 47     '--zipalign-path=<(zipalign_path)', | 39     '--zipalign-path=<(zipalign_path)', | 
| 48     '--unsigned-apk-path=<(input_apk_path)', | 40     '--unsigned-apk-path=<(input_apk_path)', | 
| 49     '--final-apk-path=<(output_apk_path)', | 41     '--final-apk-path=<(output_apk_path)', | 
| 50     '--key-path=<(keystore_path)', | 42     '--key-path=<(keystore_path)', | 
| 51     '--key-name=<(keystore_name)', | 43     '--key-name=<(keystore_name)', | 
| 52     '--key-passwd=<(keystore_password)', | 44     '--key-passwd=<(keystore_password)', | 
| 53     '--load-library-from-zip-file=<(load_library_from_zip_file)', | 45     '--load-library-from-zip-file=<(load_library_from_zip_file)', | 
| 54     '--rezip-apk-jar-path=<(rezip_apk_jar_path)', | 46     '--rezip-apk-jar-path=<(rezip_apk_jar_path)', | 
| 55   ], | 47   ], | 
| 56 } | 48 } | 
| OLD | NEW | 
|---|