From 35188af70f1b3515e5366298cbdf54737f5d4a98 Mon Sep 17 00:00:00 2001
From: Geremy Condra <gcondra@google.com>
Date: Mon, 17 Mar 2014 17:41:07 -0700
Subject: Cleanup.

Remove syspatch (now under external/syspatch) and spurious
makefile noise.

Change-Id: I2fa4b133ff18f9584b35f202de0639899906fd30
---
 verity/Android.mk |  8 --------
 verity/syspatch.c | 61 -------------------------------------------------------
 2 files changed, 69 deletions(-)
 delete mode 100644 verity/syspatch.c

(limited to 'verity')

diff --git a/verity/Android.mk b/verity/Android.mk
index 68fe0ef9..a9124a84 100644
--- a/verity/Android.mk
+++ b/verity/Android.mk
@@ -9,14 +9,6 @@ LOCAL_SHARED_LIBRARIES := libcrypto-host
 LOCAL_C_INCLUDES += external/openssl/include
 include $(BUILD_HOST_EXECUTABLE)
 
-#include $(CLEAR_VARS)
-#LOCAL_MODULE := generate_block_patch
-#LOCAL_SRC_FILES := generate_block_patch.c
-#LOCAL_MODULE_CLASS := EXECUTABLES
-#LOCAL_MODULE_TAGS := optional
-#LOCAL_SHARED_LIBRARIES := libminibsdiff
-#include $(BUILD_HOST_EXECUTABLE)
-
 include $(CLEAR_VARS)
 LOCAL_SRC_FILES := VeritySigner.java
 LOCAL_MODULE := VeritySigner
diff --git a/verity/syspatch.c b/verity/syspatch.c
deleted file mode 100644
index 7e3909de..00000000
--- a/verity/syspatch.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include "LzmaDec.h"
-
-void usage()
-{
-    fprintf(stderr, "Usage: syspatch <patch> <target>\n");
-}
-
-int main(int argc, char *argv[])
-{
-    char *patch_path;
-    char *target_path;
-
-    int patch_fd;
-    int target_fd;
-
-    if (argc == 3) {
-        patch_path = argv[1];
-        target_path = argv[2];
-    } else {
-        usage();
-        exit(-1);
-    }
-
-    patch_fd = open(patch_path, O_RDONLY);
-    if (patch_fd < 0) {
-        fprintf(stderr, "Couldn't open patch file (%s)\n", strerror(errno));
-        exit(-1);
-    }
-
-    target_fd = open(target_path, O_RDWR);
-    if (target_fd < 0) {
-        fprintf(stderr, "Couldn't open target file (%s)\n", strerror(errno));
-        exit(-1);
-    }
-
-    close(patch_fd);
-    close(target_fd);
-    exit(0);
-}
-- 
cgit v1.2.3