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

Commit 51a0e82e authored by Dees_Troy's avatar Dees_Troy
Browse files

TWRP-ify AOSP code 

Pull in most TWRP sources
Stub out partition management code
Make it compile -- probably will not boot
Kind of a mess but have to start somewhere
parent 240e4a72

Android.mk

+168 −24
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 


LOCAL_PATH := $(call my-dir)



TARGET_RECOVERY_GUI := true



include $(CLEAR_VARS)
@@ -27,32 +28,50 @@ LOCAL_SRC_FILES := \ 
    verifier.cpp \

    adb_install.cpp



LOCAL_SRC_FILES += \

    extra-functions.c \

    data.cpp \

    makelist.c \

    firmware.c \

    partition.cpp \

    partitionmanager.cpp \

    mtdutils/mtdutils.c



ifeq ($(TARGET_RECOVERY_REBOOT_SRC),)

  LOCAL_SRC_FILES += reboot.c

else

  LOCAL_SRC_FILES += $(TARGET_RECOVERY_REBOOT_SRC)

endif



LOCAL_MODULE := recovery



LOCAL_FORCE_STATIC_EXECUTABLE := true

#LOCAL_FORCE_STATIC_EXECUTABLE := true



RECOVERY_API_VERSION := 3

LOCAL_CFLAGS += -DRECOVERY_API_VERSION=$(RECOVERY_API_VERSION)



LOCAL_STATIC_LIBRARIES := \

    libext4_utils_static \

    libsparse_static \

    libminzip \

    libz \

    libmtdutils \

    libmincrypt \

    libminadbd \

    libminui \

    libpixelflinger_static \

    libpng \

    libcutils \

    libstdc++ \

    libc

#LOCAL_STATIC_LIBRARIES := \

#    libext4_utils \

#    libminzip \

#    libmtdutils \

#    libmincrypt \

#    libminadbd \

#    libpixelflinger_static



LOCAL_C_INCLUDES += bionic external/stlport/stlport



LOCAL_STATIC_LIBRARIES :=

LOCAL_SHARED_LIBRARIES :=



LOCAL_STATIC_LIBRARIES += libmtdutils

LOCAL_STATIC_LIBRARIES += libext4_utils libminadbd libminzip libunz libmincrypt

LOCAL_STATIC_LIBRARIES += libminuitwrp libpixelflinger_static libpng libjpegtwrp

LOCAL_SHARED_LIBRARIES += libz libc libstlport libcutils libstdc++



ifeq ($(TARGET_USERIMAGES_USE_EXT4), true)

    LOCAL_CFLAGS += -DUSE_EXT4

    LOCAL_C_INCLUDES += system/extras/ext4_utils

    LOCAL_STATIC_LIBRARIES += libext4_utils_static libz

    LOCAL_STATIC_LIBRARIES += libext4_utils

endif



ifeq ($(HAVE_SELINUX), true)
@@ -73,14 +92,118 @@ else 
  LOCAL_STATIC_LIBRARIES += $(TARGET_RECOVERY_UI_LIB)

endif



ifeq ($(HAVE_SELINUX),true)

  LOCAL_C_INCLUDES += external/libselinux/include

  LOCAL_STATIC_LIBRARIES += libselinux

  LOCAL_CFLAGS += -DHAVE_SELINUX

endif # HAVE_SELINUX



LOCAL_C_INCLUDES += system/extras/ext4_utils



#TWRP Build Flags

ifeq ($(BOARD_HAS_NO_REAL_SDCARD), true)

    LOCAL_CFLAGS += -DBOARD_HAS_NO_REAL_SDCARD

endif

ifneq ($(SP1_NAME),)

	LOCAL_CFLAGS += -DSP1_NAME=$(SP1_NAME) -DSP1_BACKUP_METHOD=$(SP1_BACKUP_METHOD) -DSP1_MOUNTABLE=$(SP1_MOUNTABLE)

endif

ifneq ($(SP1_DISPLAY_NAME),)

	LOCAL_CFLAGS += -DSP1_DISPLAY_NAME=$(SP1_DISPLAY_NAME)

endif

ifneq ($(SP2_NAME),)

	LOCAL_CFLAGS += -DSP2_NAME=$(SP2_NAME) -DSP2_BACKUP_METHOD=$(SP2_BACKUP_METHOD) -DSP2_MOUNTABLE=$(SP2_MOUNTABLE)

endif

ifneq ($(SP2_DISPLAY_NAME),)

	LOCAL_CFLAGS += -DSP2_DISPLAY_NAME=$(SP2_DISPLAY_NAME)

endif

ifneq ($(SP3_NAME),)

	LOCAL_CFLAGS += -DSP3_NAME=$(SP3_NAME) -DSP3_BACKUP_METHOD=$(SP3_BACKUP_METHOD) -DSP3_MOUNTABLE=$(SP3_MOUNTABLE)

endif

ifneq ($(SP3_DISPLAY_NAME),)

	LOCAL_CFLAGS += -DSP3_DISPLAY_NAME=$(SP3_DISPLAY_NAME)

endif

ifneq ($(RECOVERY_SDCARD_ON_DATA),)

	LOCAL_CFLAGS += -DRECOVERY_SDCARD_ON_DATA

endif

ifneq ($(TW_INCLUDE_DUMLOCK),)

	LOCAL_CFLAGS += -DTW_INCLUDE_DUMLOCK

endif

ifneq ($(TW_INTERNAL_STORAGE_PATH),)

	LOCAL_CFLAGS += -DTW_INTERNAL_STORAGE_PATH=$(TW_INTERNAL_STORAGE_PATH)

endif

ifneq ($(TW_INTERNAL_STORAGE_MOUNT_POINT),)

	LOCAL_CFLAGS += -DTW_INTERNAL_STORAGE_MOUNT_POINT=$(TW_INTERNAL_STORAGE_MOUNT_POINT)

endif

ifneq ($(TW_EXTERNAL_STORAGE_PATH),)

	LOCAL_CFLAGS += -DTW_EXTERNAL_STORAGE_PATH=$(TW_EXTERNAL_STORAGE_PATH)

endif

ifneq ($(TW_EXTERNAL_STORAGE_MOUNT_POINT),)

	LOCAL_CFLAGS += -DTW_EXTERNAL_STORAGE_MOUNT_POINT=$(TW_EXTERNAL_STORAGE_MOUNT_POINT)

endif

ifeq ($(TW_HAS_NO_RECOVERY_PARTITION), true)

    LOCAL_CFLAGS += -DTW_HAS_NO_RECOVERY_PARTITION

endif

ifeq ($(TW_NO_REBOOT_BOOTLOADER), true)

    LOCAL_CFLAGS += -DTW_NO_REBOOT_BOOTLOADER

endif

ifeq ($(TW_NO_REBOOT_RECOVERY), true)

    LOCAL_CFLAGS += -DTW_NO_REBOOT_RECOVERY

endif

ifeq ($(TW_NO_BATT_PERCENT), true)

    LOCAL_CFLAGS += -DTW_NO_BATT_PERCENT

endif

ifneq ($(TW_CUSTOM_POWER_BUTTON),)

	LOCAL_CFLAGS += -DTW_CUSTOM_POWER_BUTTON=$(TW_CUSTOM_POWER_BUTTON)

endif

ifeq ($(TW_ALWAYS_RMRF), true)

    LOCAL_CFLAGS += -DTW_ALWAYS_RMRF

endif

ifeq ($(TW_NEVER_UNMOUNT_SYSTEM), true)

    LOCAL_CFLAGS += -DTW_NEVER_UNMOUNT_SYSTEM

endif

ifeq ($(TW_NO_USB_STORAGE), true)

    LOCAL_CFLAGS += -DTW_NO_USB_STORAGE

endif

ifeq ($(TW_INCLUDE_INJECTTWRP), true)

    LOCAL_CFLAGS += -DTW_INCLUDE_INJECTTWRP

endif

ifeq ($(TW_INCLUDE_BLOBPACK), true)

    LOCAL_CFLAGS += -DTW_INCLUDE_BLOBPACK

endif

ifeq ($(TW_DEFAULT_EXTERNAL_STORAGE), true)

    LOCAL_CFLAGS += -DTW_DEFAULT_EXTERNAL_STORAGE

endif

ifneq ($(TARGET_USE_CUSTOM_LUN_FILE_PATH),)

    LOCAL_CFLAGS += -DCUSTOM_LUN_FILE=\"$(TARGET_USE_CUSTOM_LUN_FILE_PATH)\"

endif

ifneq ($(BOARD_UMS_LUNFILE),)

    LOCAL_CFLAGS += -DCUSTOM_LUN_FILE=\"$(BOARD_UMS_LUNFILE)\"

endif

#ifeq ($(TW_FLASH_FROM_STORAGE), true) Making this the default behavior

    LOCAL_CFLAGS += -DTW_FLASH_FROM_STORAGE

#endif

ifeq ($(TW_HAS_DOWNLOAD_MODE), true)

    LOCAL_CFLAGS += -DTW_HAS_DOWNLOAD_MODE

endif

ifeq ($(TW_SDEXT_NO_EXT4), true)

    LOCAL_CFLAGS += -DTW_SDEXT_NO_EXT4

endif

ifeq ($(TW_INCLUDE_CRYPTO), true)

    LOCAL_CFLAGS += -DTW_INCLUDE_CRYPTO

    LOCAL_CFLAGS += -DCRYPTO_FS_TYPE=\"$(TW_CRYPTO_FS_TYPE)\"

    LOCAL_CFLAGS += -DCRYPTO_REAL_BLKDEV=\"$(TW_CRYPTO_REAL_BLKDEV)\"

    LOCAL_CFLAGS += -DCRYPTO_MNT_POINT=\"$(TW_CRYPTO_MNT_POINT)\"

    LOCAL_CFLAGS += -DCRYPTO_FS_OPTIONS=\"$(TW_CRYPTO_FS_OPTIONS)\"

    LOCAL_CFLAGS += -DCRYPTO_FS_FLAGS=\"$(TW_CRYPTO_FS_FLAGS)\"

    LOCAL_CFLAGS += -DCRYPTO_KEY_LOC=\"$(TW_CRYPTO_KEY_LOC)\"

    LOCAL_SHARED_LIBRARIES += libcrypto

    LOCAL_SRC_FILES += crypto/ics/cryptfs.c

    LOCAL_C_INCLUDES += system/extras/ext4_utils external/openssl/include

endif

ifeq ($(TW_INCLUDE_JB_CRYPTO), true)

    LOCAL_CFLAGS += -DTW_INCLUDE_CRYPTO

    LOCAL_CFLAGS += -DTW_INCLUDE_JB_CRYPTO

    LOCAL_SHARED_LIBRARIES += libcrypto

    LOCAL_STATIC_LIBRARIES += libfs_mgrtwrp

    LOCAL_SRC_FILES += crypto/jb/cryptfs.c

    LOCAL_C_INCLUDES += system/extras/ext4_utils external/openssl/include

endif





include $(BUILD_EXECUTABLE)
@@ -101,13 +224,34 @@ LOCAL_STATIC_LIBRARIES := \ 
    libc

include $(BUILD_EXECUTABLE)





commands_recovery_local_path := $(LOCAL_PATH)

include $(LOCAL_PATH)/minui/Android.mk \

    $(LOCAL_PATH)/minelf/Android.mk \

    $(LOCAL_PATH)/minzip/Android.mk \

    $(LOCAL_PATH)/minadbd/Android.mk \

    $(LOCAL_PATH)/mtdutils/Android.mk \

    $(LOCAL_PATH)/tools/Android.mk \

    $(LOCAL_PATH)/edify/Android.mk \

    $(LOCAL_PATH)/updater/Android.mk \

    $(LOCAL_PATH)/applypatch/Android.mk



#includes for TWRP

include $(commands_recovery_local_path)/libjpegtwrp/Android.mk \

    $(commands_recovery_local_path)/injecttwrp/Android.mk \

    $(commands_recovery_local_path)/htcdumlock/Android.mk \

    $(commands_recovery_local_path)/minuitwrp/Android.mk \

    $(commands_recovery_local_path)/gui/Android.mk \

    $(commands_recovery_local_path)/mmcutils/Android.mk \

    $(commands_recovery_local_path)/bmlutils/Android.mk \

    $(commands_recovery_local_path)/flashutils/Android.mk \

    $(commands_recovery_local_path)/prebuilt/Android.mk \

    $(commands_recovery_local_path)/mtdutils/Android.mk \

    $(commands_recovery_local_path)/pigz/Android.mk \

    $(commands_recovery_local_path)/crypto/cryptsettings/Android.mk \

    $(commands_recovery_local_path)/libcrecovery/Android.mk



ifeq ($(TW_INCLUDE_JB_CRYPTO), true)

    include $(commands_recovery_local_path)/crypto/fs_mgr/Android.mk

endif



commands_recovery_local_path :=

applypatch/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -52,5 +52,6 @@ LOCAL_MODULE := imgdiff 
LOCAL_FORCE_STATIC_EXECUTABLE := true

LOCAL_C_INCLUDES += external/zlib external/bzip2

LOCAL_STATIC_LIBRARIES += libz libbz

LOCAL_MODULE_TAGS := eng



include $(BUILD_HOST_EXECUTABLE)

bmlutils/Android.mk

0 → 100644
+35 −0
Original line number Diff line number Diff line 
LOCAL_PATH := $(call my-dir)



include $(CLEAR_VARS)



BOARD_RECOVERY_DEFINES := BOARD_BML_BOOT BOARD_BML_RECOVERY



$(foreach board_define,$(BOARD_RECOVERY_DEFINES), \

  $(if $($(board_define)), \

    $(eval LOCAL_CFLAGS += -D$(board_define)=\"$($(board_define))\") \

  ) \

  )



LOCAL_STATIC_LIBRARIES := libcrecovery

LOCAL_C_INCLUDES := bootable/recovery/libcrecovery



LOCAL_SRC_FILES := bmlutils.c

LOCAL_MODULE := libbmlutils

LOCAL_MODULE_TAGS := eng

include $(BUILD_STATIC_LIBRARY)



#Added for building TWRP dynamic:

include $(CLEAR_VARS)



BOARD_RECOVERY_DEFINES := BOARD_BML_BOOT BOARD_BML_RECOVERY



$(foreach board_define,$(BOARD_RECOVERY_DEFINES), \

  $(if $($(board_define)), \

    $(eval LOCAL_CFLAGS += -D$(board_define)=\"$($(board_define))\") \

  ) \

  )



LOCAL_SRC_FILES := bmlutils.c

LOCAL_MODULE := libbmlutils

LOCAL_MODULE_TAGS := eng

include $(BUILD_SHARED_LIBRARY)

bmlutils/bmlutils.c

0 → 100644
+251 −0
Original line number Diff line number Diff line 
#include <ctype.h>

#include <errno.h>

#include <fcntl.h>

#include <getopt.h>

#include <limits.h>

#include <linux/input.h>

#include <stdio.h>

#include <stdlib.h>

#include <string.h>

#include <sys/reboot.h>

#include <sys/types.h>

#include <time.h>

#include <unistd.h>



#include <sys/wait.h>

#include <sys/limits.h>

#include <dirent.h>

#include <sys/stat.h>



#include <signal.h>

#include <sys/wait.h>

#include "../extra-functions.h"



//extern int __system(const char *command);

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



#ifndef BOARD_BML_BOOT

#define BOARD_BML_BOOT              "/dev/block/bml7"

#endif



#ifndef BOARD_BML_RECOVERY

#define BOARD_BML_RECOVERY          "/dev/block/bml8"

#endif



#undef _PATH_BSHELL

#define _PATH_BSHELL "/sbin/sh"



int __system(const char *command)

{

  pid_t pid;

	sig_t intsave, quitsave;

	sigset_t mask, omask;

	int pstat;

	char *argp[] = {"sh", "-c", NULL, NULL};



	if (!command)		/* just checking... */

		return(1);



	argp[2] = (char *)command;



	sigemptyset(&mask);

	sigaddset(&mask, SIGCHLD);

	sigprocmask(SIG_BLOCK, &mask, &omask);

	switch (pid = vfork()) {

	case -1:			/* error */

		sigprocmask(SIG_SETMASK, &omask, NULL);

		return(-1);

	case 0:				/* child */

		sigprocmask(SIG_SETMASK, &omask, NULL);

		execve(_PATH_BSHELL, argp, environ);

    _exit(127);

  }



	intsave = (sig_t)  bsd_signal(SIGINT, SIG_IGN);

	quitsave = (sig_t) bsd_signal(SIGQUIT, SIG_IGN);

	pid = waitpid(pid, (int *)&pstat, 0);

	sigprocmask(SIG_SETMASK, &omask, NULL);

	(void)bsd_signal(SIGINT, intsave);

	(void)bsd_signal(SIGQUIT, quitsave);

	return (pid == -1 ? -1 : pstat);

}



static struct pid {

	struct pid *next;

	FILE *fp;

	pid_t pid;

} *pidlist;





static int restore_internal(const char* bml, const char* filename)

{

    char buf[4096];

    int dstfd, srcfd, bytes_read, bytes_written, total_read = 0;

    if (filename == NULL)

        srcfd = 0;

    else {

        srcfd = open(filename, O_RDONLY | O_LARGEFILE);

        if (srcfd < 0)

            return 2;

    }

    dstfd = open(bml, O_RDWR | O_LARGEFILE);

    if (dstfd < 0)

        return 3;

    if (ioctl(dstfd, BML_UNLOCK_ALL, 0))

        return 4;

    do {

        total_read += bytes_read = read(srcfd, buf, 4096);

        if (!bytes_read)

            break;

        if (bytes_read < 4096)

            memset(&buf[bytes_read], 0, 4096 - bytes_read);

        if (write(dstfd, buf, 4096) < 4096)

            return 5;

    } while(bytes_read == 4096);

    

    close(dstfd);

    close(srcfd);

    

    return 0;

}



int cmd_bml_restore_raw_partition(const char *partition, const char *filename)

{

    if (strcmp(partition, "boot") != 0 && strcmp(partition, "recovery") != 0 && strcmp(partition, "recoveryonly") != 0 && partition[0] != '/')

        return 6;



    int ret = -1;

    if (strcmp(partition, "recoveryonly") != 0) {

        // always restore boot, regardless of whether recovery or boot is flashed.

        // this is because boot and recovery are the same on some samsung phones.

        // unless of course, recoveryonly is explictly chosen (bml8)

        ret = restore_internal(BOARD_BML_BOOT, filename);

        if (ret != 0)

            return ret;

    }



    if (strcmp(partition, "recovery") == 0 || strcmp(partition, "recoveryonly") == 0)

        ret = restore_internal(BOARD_BML_RECOVERY, filename);



    // support explicitly provided device paths

    if (partition[0] == '/')

        ret = restore_internal(partition, filename);

    return ret;

}



int cmd_bml_backup_raw_partition(const char *partition, const char *out_file)

{

    char* bml;

    if (strcmp("boot", partition) == 0)

        bml = BOARD_BML_BOOT;

    else if (strcmp("recovery", partition) == 0)

        bml = BOARD_BML_RECOVERY;

    else if (partition[0] == '/') {

        // support explicitly provided device paths

        bml = partition;

    }

    else {

        printf("Invalid partition.\n");

        return -1;

    }



    int ch;

    FILE *in;

    FILE *out;

    int val = 0;

    char buf[512];

    unsigned sz = 0;

    unsigned i;

    int ret = -1;

    char *in_file = bml;



    in  = fopen ( in_file,  "r" );

    if (in == NULL)

        goto ERROR3;



    out = fopen ( out_file,  "w" );

    if (out == NULL)

        goto ERROR2;



    fseek(in, 0L, SEEK_END);

    sz = ftell(in);

    fseek(in, 0L, SEEK_SET);



    if (sz % 512)

    {

        while ( ( ch = fgetc ( in ) ) != EOF )

            fputc ( ch, out );

    }

    else

    {

        for (i=0; i< (sz/512); i++)

        {

            if ((fread(buf, 512, 1, in)) != 1)

                goto ERROR1;

            if ((fwrite(buf, 512, 1, out)) != 1)

                goto ERROR1;

        }

    }



    fsync(out);

    ret = 0;

ERROR1:

    fclose ( out );

ERROR2:

    fclose ( in );

ERROR3:

    return ret;

}



int cmd_bml_erase_raw_partition(const char *partition)

{

    // TODO: implement raw wipe

    return 0;

}



int cmd_bml_erase_partition(const char *partition, const char *filesystem)

{

    return -1;

}



int cmd_bml_mount_partition(const char *partition, const char *mount_point, const char *filesystem, int read_only)

{

    return -1;

}



int cmd_bml_get_partition_device(const char *partition, char *device)

{

    return -1;

}



int format_rfs_device (const char *device, const char *path) {

    const char *fatsize = "32";

    const char *sectorsize = "1";



    if (strcmp(path, "/datadata") == 0 || strcmp(path, "/cache") == 0) {

        fatsize = "16";

    }



    // Just in case /data sector size needs to be altered

    else if (strcmp(path, "/data") == 0 ) {

        sectorsize = "1";

    } 



    // dump 10KB of zeros to partition before format due to fat.format bug

    char cmd[PATH_MAX];



    sprintf(cmd, "/sbin/dd if=/dev/zero of=%s bs=4096 count=10", device);

    if(__system(cmd)) {

        printf("failure while zeroing rfs partition.\n");

        return -1;

    }



    // Run fat.format

    sprintf(cmd, "/sbin/fat.format -F %s -S 4096 -s %s %s", fatsize, sectorsize, device);

    if(__system(cmd)) {

        printf("failure while running fat.format\n");

        return -1;

    }



    return 0;

}

bmlutils/bmlutils.h

0 → 100644
+6 −0
Original line number Diff line number Diff line 
#ifndef BMLUTILS_H_

#define BMLUTILS_H_



int format_rfs_device (const char *device, const char *path);



#endif // BMLUTILS_H_