summaryrefslogtreecommitdiffstats
path: root/applypatch/main.c
diff options
context:
space:
mode:
authorDoug Zongker <dougz@android.com>2014-02-13 15:18:19 -0800
committerDoug Zongker <dougz@android.com>2014-02-13 15:18:19 -0800
commita1bc148c7c81f886426c253f2ea7beb0f301f6b0 (patch)
tree2ece82d93c5be1f793d8cf1d475dcd5d2cab442a /applypatch/main.c
parent52b4036eb820042d0309b32b579c52b63ca58b4d (diff)
downloadbootable_recovery-a1bc148c7c81f886426c253f2ea7beb0f301f6b0.zip
bootable_recovery-a1bc148c7c81f886426c253f2ea7beb0f301f6b0.tar.gz
bootable_recovery-a1bc148c7c81f886426c253f2ea7beb0f301f6b0.tar.bz2
remove 'retouch' ASLR support
Older versions of android supported an ASLR system where binaries were randomly twiddled at OTA install time. Remove support for this; we now use the ASLR support in the linux kernel. Change-Id: I8348eb0d6424692668dc1a00e2416fbef6c158a2
Diffstat (limited to 'applypatch/main.c')
-rw-r--r--applypatch/main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/applypatch/main.c b/applypatch/main.c
index f61db5d..8e9fe80 100644
--- a/applypatch/main.c
+++ b/applypatch/main.c
@@ -74,7 +74,7 @@ static int ParsePatchArgs(int argc, char** argv,
(*patches)[i] = NULL;
} else {
FileContents fc;
- if (LoadFileContents(colon, &fc, RETOUCH_DONT_MASK) != 0) {
+ if (LoadFileContents(colon, &fc) != 0) {
goto abort;
}
(*patches)[i] = malloc(sizeof(Value));
@@ -103,7 +103,7 @@ int PatchMode(int argc, char** argv) {
Value* bonus = NULL;
if (argc >= 3 && strcmp(argv[1], "-b") == 0) {
FileContents fc;
- if (LoadFileContents(argv[2], &fc, RETOUCH_DONT_MASK) != 0) {
+ if (LoadFileContents(argv[2], &fc) != 0) {
printf("failed to load bonus file %s\n", argv[2]);
return 1;
}