CTCaer/CTCaer-CWM
1
0
Fork 0
mirror of https://github.com/CTCaer/CTCaer-CWM.git synced 2024-11-26 19:40:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix build on gcc 4.6.

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

Change-Id: I12b33a9157ab74825129896d0f2177fa83638464
Signed-off-by: Evan McClain <aeroevan@gmail.com>
This commit is contained in:
Evan McClain 2012-05-18 01:28:26 -04:00
parent 9a7615326e
commit 8ba9a6335b
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bmlutils/Android.mk
View File

@ -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_SRC_FILES := bmlutils.c
LOCAL_MODULE := libbmlutils LOCAL_MODULE := libbmlutils
LOCAL_MODULE_TAGS := eng LOCAL_MODULE_TAGS := eng

3
bmlutils/bmlutils.c
View File

@ -20,7 +20,8 @@
#include <signal.h> #include <signal.h>
#include <sys/wait.h> #include <sys/wait.h>
extern int __system(const char *command); #include <common.h>
#define BML_UNLOCK_ALL 0x8A29 ///< unlock all partition RO -> RW #define BML_UNLOCK_ALL 0x8A29 ///< unlock all partition RO -> RW
#ifndef BOARD_BML_BOOT #ifndef BOARD_BML_BOOT

6
flashutils/Android.mk
View File

@ -24,7 +24,7 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := flash_image.c LOCAL_SRC_FILES := flash_image.c
LOCAL_MODULE := flash_image LOCAL_MODULE := flash_image
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_STATIC_LIBRARIES := libflashutils libmtdutils libmmcutils libbmlutils LOCAL_STATIC_LIBRARIES := libflashutils libmtdutils libmmcutils libbmlutils libcrecovery
LOCAL_SHARED_LIBRARIES := libcutils libc LOCAL_SHARED_LIBRARIES := libcutils libc
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)
@ -32,7 +32,7 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := dump_image.c LOCAL_SRC_FILES := dump_image.c
LOCAL_MODULE := dump_image LOCAL_MODULE := dump_image
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_STATIC_LIBRARIES := libflashutils libmtdutils libmmcutils libbmlutils LOCAL_STATIC_LIBRARIES := libflashutils libmtdutils libmmcutils libbmlutils libcrecovery
LOCAL_SHARED_LIBRARIES := libcutils libc LOCAL_SHARED_LIBRARIES := libcutils libc
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)
@ -40,7 +40,7 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := erase_image.c LOCAL_SRC_FILES := erase_image.c
LOCAL_MODULE := erase_image LOCAL_MODULE := erase_image
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_STATIC_LIBRARIES := libflashutils libmtdutils libmmcutils libbmlutils LOCAL_STATIC_LIBRARIES := libflashutils libmtdutils libmmcutils libbmlutils libcrecovery
LOCAL_SHARED_LIBRARIES := libcutils libc LOCAL_SHARED_LIBRARIES := libcutils libc
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)

4
updater/Android.mk
View File

@ -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 += $(TARGET_RECOVERY_UPDATER_LIBS) $(TARGET_RECOVERY_UPDATER_EXTRA_LIBS)
LOCAL_STATIC_LIBRARIES += libapplypatch libedify libmtdutils libminzip libz LOCAL_STATIC_LIBRARIES += libapplypatch libedify libmtdutils libminzip libz
LOCAL_STATIC_LIBRARIES += libmincrypt libbz LOCAL_STATIC_LIBRARIES += libmincrypt libbz
LOCAL_STATIC_LIBRARIES += libminelf LOCAL_STATIC_LIBRARIES += libminelf libcrecovery
LOCAL_STATIC_LIBRARIES += libcutils libstdc++ libc LOCAL_STATIC_LIBRARIES += libcutils libstdc++ libc
LOCAL_C_INCLUDES += $(LOCAL_PATH)/.. LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
@ -73,4 +73,4 @@ LOCAL_MODULE := updater
LOCAL_FORCE_STATIC_EXECUTABLE := true LOCAL_FORCE_STATIC_EXECUTABLE := true
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)