Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ba9a633 authored by Evan McClain's avatar Evan McClain
Browse files

Fix build on gcc 4.6. 



Several programs were not linked against libcrecovery which has the __system
function.

Change-Id: I12b33a9157ab74825129896d0f2177fa83638464
Signed-off-by: default avatarEvan McClain <aeroevan@gmail.com>
parent 9a761532

bmlutils/Android.mk

+3 −0
Original line number Diff line number Diff line
@@ -10,6 +10,9 @@ $(foreach board_define,$(BOARD_RECOVERY_DEFINES), \ 
  ) \

  )



LOCAL_STATIC_LIBRARIES := libcrecovery

LOCAL_C_INCLUDES := bootable/recovery/libcrecovery



LOCAL_SRC_FILES := bmlutils.c

LOCAL_MODULE := libbmlutils

LOCAL_MODULE_TAGS := eng

bmlutils/bmlutils.c

+2 −1
Original line number Diff line number Diff line
@@ -20,7 +20,8 @@ 
#include <signal.h>

#include <sys/wait.h>



extern int __system(const char *command);

#include <common.h>



#define BML_UNLOCK_ALL				0x8A29		///< unlock all partition RO -> RW



#ifndef BOARD_BML_BOOT

flashutils/Android.mk

+3 −3
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ include $(CLEAR_VARS) 
LOCAL_SRC_FILES := flash_image.c

LOCAL_MODULE := flash_image

LOCAL_MODULE_TAGS := optional

LOCAL_STATIC_LIBRARIES := libflashutils libmtdutils libmmcutils libbmlutils

LOCAL_STATIC_LIBRARIES := libflashutils libmtdutils libmmcutils libbmlutils libcrecovery

LOCAL_SHARED_LIBRARIES := libcutils libc

include $(BUILD_EXECUTABLE)
@@ -32,7 +32,7 @@ include $(CLEAR_VARS) 
LOCAL_SRC_FILES := dump_image.c

LOCAL_MODULE := dump_image

LOCAL_MODULE_TAGS := optional

LOCAL_STATIC_LIBRARIES := libflashutils libmtdutils libmmcutils libbmlutils

LOCAL_STATIC_LIBRARIES := libflashutils libmtdutils libmmcutils libbmlutils libcrecovery

LOCAL_SHARED_LIBRARIES := libcutils libc

include $(BUILD_EXECUTABLE)
@@ -40,7 +40,7 @@ include $(CLEAR_VARS) 
LOCAL_SRC_FILES := erase_image.c

LOCAL_MODULE := erase_image

LOCAL_MODULE_TAGS := optional

LOCAL_STATIC_LIBRARIES := libflashutils libmtdutils libmmcutils libbmlutils

LOCAL_STATIC_LIBRARIES := libflashutils libmtdutils libmmcutils libbmlutils libcrecovery

LOCAL_SHARED_LIBRARIES := libcutils libc

include $(BUILD_EXECUTABLE)

updater/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ LOCAL_STATIC_LIBRARIES += libflashutils libmtdutils libmmcutils libbmlutils 
LOCAL_STATIC_LIBRARIES += $(TARGET_RECOVERY_UPDATER_LIBS) $(TARGET_RECOVERY_UPDATER_EXTRA_LIBS)

LOCAL_STATIC_LIBRARIES += libapplypatch libedify libmtdutils libminzip libz

LOCAL_STATIC_LIBRARIES += libmincrypt libbz

LOCAL_STATIC_LIBRARIES += libminelf

LOCAL_STATIC_LIBRARIES += libminelf libcrecovery

LOCAL_STATIC_LIBRARIES += libcutils libstdc++ libc

LOCAL_C_INCLUDES += $(LOCAL_PATH)/..