From 64893ccc09b25ac31bc6a17f5c7f43c7fa789576 Mon Sep 17 00:00:00 2001 From: Doug Zongker Date: Tue, 14 Jul 2009 16:31:56 -0700 Subject: remove amend Yank all the code to install OTA packages out of the recovery binary itself. Now packages are installed by a binary included in the package (run as a child of recovery), so we can make improvements in the installation process without waiting for a new release to use them. --- recovery.c | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) (limited to 'recovery.c') diff --git a/recovery.c b/recovery.c index 5ccd38f2c..0408abf92 100644 --- a/recovery.c +++ b/recovery.c @@ -29,7 +29,6 @@ #include #include "bootloader.h" -#include "commands.h" #include "common.h" #include "cutils/properties.h" #include "firmware.h" @@ -258,23 +257,6 @@ finish_recovery(const char *send_intent) sync(); // For good measure. } -#define TEST_AMEND 0 -#if TEST_AMEND -static void -test_amend() -{ - extern int test_symtab(void); - extern int test_cmd_fn(void); - int ret; - LOGD("Testing symtab...\n"); - ret = test_symtab(); - LOGD(" returned %d\n", ret); - LOGD("Testing cmd_fn...\n"); - ret = test_cmd_fn(); - LOGD(" returned %d\n", ret); -} -#endif // TEST_AMEND - static int erase_root(const char *root) { @@ -288,7 +270,7 @@ static void prompt_and_wait() { char* headers[] = { "Android system recovery <" - EXPAND(RECOVERY_API_VERSION) ">", + EXPAND(RECOVERY_API_VERSION) "e>", "", "Use trackball to highlight;", "click to select.", @@ -445,15 +427,6 @@ main(int argc, char **argv) property_list(print_property, NULL); fprintf(stderr, "\n"); -#if TEST_AMEND - test_amend(); -#endif - - RecoveryCommandContext ctx = { NULL }; - if (register_update_commands(&ctx)) { - LOGE("Can't install update commands\n"); - } - int status = INSTALL_SUCCESS; if (update_package != NULL) { -- cgit v1.2.3