diff options
author | Hristo Bojinov <hristo@google.com> | 2010-08-26 14:35:16 -0700 |
---|---|---|
committer | Hristo Bojinov <hristo@google.com> | 2010-08-26 14:37:42 -0700 |
commit | dafb04275588fff8248b6a5360ca047cdffd14a5 (patch) | |
tree | b5738603ab7accac811dac047741215312c9fe06 /tools/releasetools | |
parent | 920e102d796b10229c302d366104d2c86094a91a (diff) | |
download | build-dafb04275588fff8248b6a5360ca047cdffd14a5.zip build-dafb04275588fff8248b6a5360ca047cdffd14a5.tar.gz build-dafb04275588fff8248b6a5360ca047cdffd14a5.tar.bz2 |
Turn on ASLR by default. The "-a" option now takes an argument (on/off).
Change-Id: I4ddc70f2087c23586fc6aaaff3bb862f83d9779d
Diffstat (limited to 'tools/releasetools')
-rwxr-xr-x | tools/releasetools/ota_from_target_files | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/tools/releasetools/ota_from_target_files b/tools/releasetools/ota_from_target_files index d249214..69af4bc 100755 --- a/tools/releasetools/ota_from_target_files +++ b/tools/releasetools/ota_from_target_files @@ -44,8 +44,8 @@ Usage: ota_from_target_files [flags] input_target_files output_ota_package -e (--extra_script) <file> Insert the contents of file at the end of the update script. - -a (--use_aslr) - Specify whether to build the package with ASLR enabled (off by default). + -a (--aslr_mode) <on|off> + Specify whether to turn on ASLR for the package (on by default). """ import sys @@ -77,7 +77,7 @@ OPTIONS.patch_threshold = 0.95 OPTIONS.wipe_user_data = False OPTIONS.omit_prereq = False OPTIONS.extra_script = None -OPTIONS.aslr_mode = False +OPTIONS.aslr_mode = True OPTIONS.worker_threads = 3 def MostPopularKey(d, default): @@ -867,8 +867,11 @@ def main(argv): OPTIONS.omit_prereq = True elif o in ("-e", "--extra_script"): OPTIONS.extra_script = a - elif o in ("-a", "--use_aslr"): - OPTIONS.aslr_mode = True + elif o in ("-a", "--aslr_mode"): + if a in ("on", "On", "true", "True", "yes", "Yes"): + OPTIONS.aslr_mode = True + else: + OPTIONS.aslr_mode = False elif o in ("--worker_threads"): OPTIONS.worker_threads = int(a) else: @@ -876,7 +879,7 @@ def main(argv): return True args = common.ParseOptions(argv, __doc__, - extra_opts="b:k:i:d:wne:a", + extra_opts="b:k:i:d:wne:a:", extra_long_opts=["board_config=", "package_key=", "incremental_from=", @@ -884,7 +887,7 @@ def main(argv): "no_prereq", "extra_script=", "worker_threads=", - "use_aslr"], + "aslr_mode="], extra_option_handler=option_handler) if len(args) != 2: |