summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoragrieve <agrieve@chromium.org>2015-09-24 18:15:47 -0700
committerCommit bot <commit-bot@chromium.org>2015-09-25 01:16:38 +0000
commit1ed522607cd798f60c6120ed5f97b85e6a233f47 (patch)
treee0368db732ecf612d9ef10132ef595e3a55f5bc6
parentff6ca4d26a17c90379a61006a8c2afb2f755b7a6 (diff)
downloadchromium_src-1ed522607cd798f60c6120ed5f97b85e6a233f47.zip
chromium_src-1ed522607cd798f60c6120ed5f97b85e6a233f47.tar.gz
chromium_src-1ed522607cd798f60c6120ed5f97b85e6a233f47.tar.bz2
Make use of md5_check within finalize_apk.py
This stops the _incremental.apk from being re-finalized over and over during normal development. BUG=533442 Review URL: https://codereview.chromium.org/1348533006 Cr-Commit-Position: refs/heads/master@{#350732}
-rwxr-xr-xbuild/android/gyp/finalize_apk.py31
1 files changed, 23 insertions, 8 deletions
diff --git a/build/android/gyp/finalize_apk.py b/build/android/gyp/finalize_apk.py
index 0a80035..a6a1040 100755
--- a/build/android/gyp/finalize_apk.py
+++ b/build/android/gyp/finalize_apk.py
@@ -65,7 +65,9 @@ def AlignApk(zipalign_path, unaligned_path, final_path):
build_utils.CheckOutput(align_cmd)
-def main():
+def main(args):
+ args = build_utils.ExpandFileArgs(args)
+
parser = optparse.OptionParser()
build_utils.AddDepfileOption(parser)
@@ -86,14 +88,27 @@ def main():
options, _ = parser.parse_args()
- FinalizeApk(options)
+ input_paths = [
+ options.unsigned_apk_path,
+ options.key_path,
+ ]
+
+ if options.load_library_from_zip:
+ input_paths.append(options.rezip_apk_jar_path)
- if options.depfile:
- build_utils.WriteDepfile(
- options.depfile, build_utils.GetPythonDependencies())
+ input_strings = [
+ options.load_library_from_zip,
+ options.key_name,
+ options.key_passwd,
+ ]
- if options.stamp:
- build_utils.Touch(options.stamp)
+ build_utils.CallAndWriteDepfileIfStale(
+ lambda: FinalizeApk(options),
+ options,
+ record_path=options.unsigned_apk_path + '.finalize.md5.stamp',
+ input_paths=input_paths,
+ input_strings=input_strings,
+ output_paths=[options.final_apk_path])
def FinalizeApk(options):
@@ -129,4 +144,4 @@ def FinalizeApk(options):
if __name__ == '__main__':
- sys.exit(main())
+ sys.exit(main(sys.argv[1:]))