use new libreboot static lib for rebooting

relevant commit is here: http://review.cyanogenmod.com/#change,6128

Change-Id: Id8587cba4017c322b3a5b89c1f994ade684f424a
This commit is contained in:
Austen Dicken 2011-06-14 15:47:40 -05:00
parent 2457adcdf7
commit 7126ef404c
2 changed files with 4 additions and 5 deletions

View File

@ -31,7 +31,7 @@ LOCAL_CFLAGS += -DRECOVERY_VERSION="$(RECOVERY_VERSION)"
RECOVERY_API_VERSION := 2
LOCAL_CFLAGS += -DRECOVERY_API_VERSION=$(RECOVERY_API_VERSION)
BOARD_RECOVERY_DEFINES := BOARD_HAS_NO_SELECT_BUTTON BOARD_HAS_SMALL_RECOVERY BOARD_LDPI_RECOVERY BOARD_UMS_LUNFILE TARGET_RECOVERY_PRE_COMMAND
BOARD_RECOVERY_DEFINES := BOARD_HAS_NO_SELECT_BUTTON BOARD_HAS_SMALL_RECOVERY BOARD_LDPI_RECOVERY BOARD_UMS_LUNFILE
$(foreach board_define,$(BOARD_RECOVERY_DEFINES), \
$(if $($(board_define)), \
@ -53,6 +53,7 @@ else
LOCAL_SRC_FILES += $(BOARD_CUSTOM_RECOVERY_KEYMAPPING)
endif
LOCAL_STATIC_LIBRARIES += libreboot
LOCAL_STATIC_LIBRARIES += libext4_utils libz
LOCAL_STATIC_LIBRARIES += libminzip libunz libmincrypt

View File

@ -8,6 +8,7 @@
#include <stdlib.h>
#include <string.h>
#include <sys/reboot.h>
#include <reboot/reboot.h>
#include <sys/types.h>
#include <time.h>
#include <unistd.h>
@ -894,10 +895,7 @@ void show_advanced_menu()
switch (chosen_item)
{
case 0:
#ifdef TARGET_RECOVERY_PRE_COMMAND
__system( TARGET_RECOVERY_PRE_COMMAND );
#endif
__reboot(LINUX_REBOOT_MAGIC1, LINUX_REBOOT_MAGIC2, LINUX_REBOOT_CMD_RESTART2, "recovery");
reboot_wrapper("recovery");
break;
case 1:
{