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

Commit c798c9cd authored by Ethan Yonker's avatar Ethan Yonker
Browse files

Merge up to AOSP marshmallow-release 

In order to maintain compatibility with older trees, we now have
minadbd.old and minui.old. I had to use a TARGET_GLOBAL_CFLAG to
handle ifdef issues in minui/minui.d because healthd includes
minui/minui.h and there was no other alternative to make minui.h
compatible with older trees without having to modify healthd rules
which is outside of TWRP.

Note that the new minui does not currently have support for qcom
overlay graphics. Support for this graphics mode will likely be
added in a later patch set. If you are building in a 6.0 tree and
have a device that needs qcom overlay graphics, be warned, as off
mode charging may not work properly. A dead battery in this case
could potentially brick your device if it is unable to charge as
healthd handles charging duties.

Update rules for building toolbox and add rules for making toybox

Use permissive.sh in init.rc which will follow symlinks so we do
not have to worry about what binary is supplying the setenforce
functionality (toolbox, toybox, or busybox).

Fix a few warnings in the main recovery binary source code.

Fix a few includes that were missing that prevented compiling in
6.0

Change-Id: Ia67aa2107d260883da5e365475a19bea538e8b97
parents d6821a11 f5cfdcec

Android.mk

+37 −13
Original line number Diff line number Diff line
@@ -88,14 +88,25 @@ LOCAL_CFLAGS += -Wno-unused-parameter 
#    libm \

#    libc



LOCAL_C_INCLUDES += \

    system/vold \

    system/extras/ext4_utils \

    system/core/adb \



LOCAL_C_INCLUDES += bionic external/stlport/stlport external/openssl/include $(LOCAL_PATH)/libmincrypt/includes



LOCAL_STATIC_LIBRARIES :=

LOCAL_SHARED_LIBRARIES :=



LOCAL_STATIC_LIBRARIES += libguitwrp

LOCAL_SHARED_LIBRARIES += libz libc libstlport libcutils libstdc++ libtar libblkid libminuitwrp libminadbd libmtdutils libminzip libaosprecovery

LOCAL_SHARED_LIBRARIES += libgccdemangle libcrecovery

LOCAL_SHARED_LIBRARIES += libz libc libcutils libstdc++ libtar libblkid libminuitwrp libminadbd libmtdutils libminzip libaosprecovery

LOCAL_SHARED_LIBRARIES += libcrecovery



ifneq ($(wildcard external/stlport/Android.mk),)

    LOCAL_SHARED_LIBRARIES += libstlport

else

    LOCAL_SHARED_LIBRARIES += libc++

endif



ifneq ($(wildcard system/core/libsparse/Android.mk),)

LOCAL_SHARED_LIBRARIES += libsparse
@@ -113,7 +124,7 @@ ifeq ($(TARGET_USERIMAGES_USE_EXT4), true) 
    LOCAL_C_INCLUDES += system/extras/ext4_utils

    LOCAL_SHARED_LIBRARIES += libext4_utils

    ifneq ($(wildcard external/lz4/Android.mk),)

        LOCAL_STATIC_LIBRARIES += liblz4-static

        #LOCAL_STATIC_LIBRARIES += liblz4-static

    endif

endif

ifneq ($(wildcard external/libselinux/Android.mk),)
@@ -138,14 +149,10 @@ ifeq ($(TWHAVE_SELINUX), true) 
    endif

endif



# This binary is in the recovery ramdisk, which is otherwise a copy of root.

# It gets copied there in config/Makefile.  LOCAL_MODULE_TAGS suppresses

# a (redundant) copy of the binary in /system/bin for user builds.

# TODO: Build the ramdisk image in a more principled way.

LOCAL_MODULE_TAGS := eng

LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin



#ifeq ($(TARGET_RECOVERY_UI_LIB),)

  LOCAL_SRC_FILES += default_device.cpp

#  LOCAL_SRC_FILES += default_device.cpp

#else

#  LOCAL_STATIC_LIBRARIES += $(TARGET_RECOVERY_UI_LIB)

#endif
@@ -271,6 +278,7 @@ endif 
ifeq ($(TW_INCLUDE_CRYPTO), true)

    LOCAL_CFLAGS += -DTW_INCLUDE_CRYPTO

    LOCAL_SHARED_LIBRARIES += libcryptfslollipop

    LOCAL_C_INCLUDES += external/boringssl/src/include

endif

ifeq ($(TW_USE_MODEL_HARDWARE_ID_FOR_DEVICE_ID), true)

    LOCAL_CFLAGS += -DTW_USE_MODEL_HARDWARE_ID_FOR_DEVICE_ID
@@ -311,6 +319,9 @@ endif 
ifneq ($(TARGET_RECOVERY_INITRC),)

    TW_EXCLUDE_DEFAULT_USB_INIT := true

endif

ifeq ($(shell test $(PLATFORM_SDK_VERSION) -gt 22; echo $$?),0)

    LOCAL_CFLAGS += -DTW_USE_NEW_MINADBD

endif



LOCAL_ADDITIONAL_DEPENDENCIES := \

    dump_image \
@@ -339,6 +350,10 @@ else 
endif

ifneq ($(TW_USE_TOOLBOX), true)

    LOCAL_ADDITIONAL_DEPENDENCIES += busybox_symlinks

else

    ifneq ($(wildcard external/toybox/Android.mk),)

        LOCAL_ADDITIONAL_DEPENDENCIES += toybox_symlinks

    endif

endif

ifneq ($(TW_NO_EXFAT), true)

    LOCAL_ADDITIONAL_DEPENDENCIES += mkexfatfs
@@ -483,9 +498,7 @@ endif 
include $(BUILD_SHARED_LIBRARY)



commands_recovery_local_path := $(LOCAL_PATH)

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

    $(LOCAL_PATH)/minadbd/Android.mk \

    $(LOCAL_PATH)/tests/Android.mk \

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

    $(LOCAL_PATH)/tools/Android.mk \

    $(LOCAL_PATH)/edify/Android.mk \

    $(LOCAL_PATH)/updater/Android.mk \
@@ -495,6 +508,15 @@ ifeq ($(wildcard system/core/uncrypt/Android.mk),) 
    include $(commands_recovery_local_path)/uncrypt/Android.mk

endif



ifeq ($(shell test $(PLATFORM_SDK_VERSION) -gt 22; echo $$?),0)

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

        $(commands_recovery_local_path)/minui/Android.mk

else

    TARGET_GLOBAL_CFLAGS += -DTW_USE_OLD_MINUI_H

    include $(commands_recovery_local_path)/minadbd.old/Android.mk \

        $(commands_recovery_local_path)/minui.old/Android.mk

endif



#includes for TWRP

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

    $(commands_recovery_local_path)/htcdumlock/Android.mk \
@@ -516,7 +538,9 @@ include $(commands_recovery_local_path)/injecttwrp/Android.mk \ 
    $(commands_recovery_local_path)/mtp/Android.mk \

    $(commands_recovery_local_path)/minzip/Android.mk \

    $(commands_recovery_local_path)/dosfstools/Android.mk \

    $(commands_recovery_local_path)/etc/Android.mk

    $(commands_recovery_local_path)/etc/Android.mk \

    $(commands_recovery_local_path)/toybox/Android.mk \

    $(commands_recovery_local_path)/libpixelflinger/Android.mk



ifeq ($(TW_INCLUDE_CRYPTO), true)

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

README.md

+0 −9
Original line number Diff line number Diff line 
**Team Win Recovery Project (TWRP)**



The goal of this branch is to rebase TWRP onto AOSP while maintaining as much of the original AOSP code as possible. This goal should allow us to apply updates to the AOSP code going forward with little to no extra work.  With this goal in mind, we will carefully consider any changes needed to the AOSP code before allowing them.  In most cases, instead of changing the AOSP code, we'll create our own functions instead.  The only changes that should be made to AOSP code should be those affecting startup of the recovery and some of the make files.



If there are changes that need to be merged from AOSP, we will pull the change directly from AOSP instead of creating a new patch in order to prevent merge conflicts with AOSP.



This branch is under final testing and will be used shortly for public builds, but has not officially been released.



You can find a compiling guide [here](http://forum.xda-developers.com/showthread.php?t=1943625 "Guide").

[More information about the project.](http://www.teamw.in/project/twrp2 "More Information")



If you have code changes to submit those should be pushed to our gerrit instance.  A guide can be found [here](http://teamw.in/twrp2-gerrit "Gerrit Guide").

adb_install.cpp

+7 −5
Original line number Diff line number Diff line
@@ -29,10 +29,8 @@ 
#include "ui.h"

#include "cutils/properties.h"

#include "adb_install.h"

extern "C" {

#include "minadbd/fuse_adb_provider.h"

#include "fuse_sideload.h"

}



static RecoveryUI* ui = NULL;
@@ -47,7 +45,8 @@ set_usb_driver(bool enabled) { 
		printf("failed to open driver control: %s\n", strerror(errno));

        return;

    }

    if (write(fd, enabled ? "1" : "0", 1) < 0) {



    if (TEMP_FAILURE_RETRY(write(fd, enabled ? "1" : "0", 1)) == -1) {

/*

        ui->Print("failed to set driver control: %s\n", strerror(errno));

*/
@@ -67,12 +66,15 @@ stop_adbd() { 
    set_usb_driver(false);

}



bool is_ro_debuggable() {

    char value[PROPERTY_VALUE_MAX+1];

    return (property_get("ro.debuggable", value, NULL) == 1 && value[0] == '1');

}



void

maybe_restart_adbd() {

    char value[PROPERTY_VALUE_MAX+1];

    int len = property_get("ro.debuggable", value, NULL);

    if (len == 1 && value[0] == '1') {

    if (is_ro_debuggable()) {

        printf("Restarting adbd...\n");

        set_usb_driver(true);

        property_set("ctl.start", "adbd");

applypatch/applypatch.c

+28 −25
Original line number Diff line number Diff line
@@ -453,21 +453,20 @@ int WriteToPartition(unsigned char* data, size_t len, 
            int attempt;



            for (attempt = 0; attempt < 2; ++attempt) {

                lseek(fd, start, SEEK_SET);

                if (TEMP_FAILURE_RETRY(lseek(fd, start, SEEK_SET)) == -1) {

                    printf("failed seek on %s: %s\n",

                           partition, strerror(errno));

                    return -1;

                }

                while (start < len) {

                    size_t to_write = len - start;

                    if (to_write > 1<<20) to_write = 1<<20;



                    ssize_t written = write(fd, data+start, to_write);

                    if (written < 0) {

                        if (errno == EINTR) {

                            written = 0;

                        } else {

                            printf("failed write writing to %s (%s)\n",

                                   partition, strerror(errno));

                    ssize_t written = TEMP_FAILURE_RETRY(write(fd, data+start, to_write));

                    if (written == -1) {

                        printf("failed write writing to %s: %s\n", partition, strerror(errno));

                        return -1;

                    }

                    }

                    start += written;

                }

                if (fsync(fd) != 0) {
@@ -491,13 +490,20 @@ int WriteToPartition(unsigned char* data, size_t len, 
                // won't just be reading the cache.

                sync();

                int dc = open("/proc/sys/vm/drop_caches", O_WRONLY);

                write(dc, "3\n", 2);

                if (TEMP_FAILURE_RETRY(write(dc, "3\n", 2)) == -1) {

                    printf("write to /proc/sys/vm/drop_caches failed: %s\n", strerror(errno));

                } else {

                    printf("  caches dropped\n");

                }

                close(dc);

                sleep(1);

                printf("  caches dropped\n");



                // verify

                lseek(fd, 0, SEEK_SET);

                if (TEMP_FAILURE_RETRY(lseek(fd, 0, SEEK_SET)) == -1) {

                    printf("failed to seek back to beginning of %s: %s\n",

                           partition, strerror(errno));

                    return -1;

                }

                unsigned char buffer[4096];

                start = len;

                size_t p;
@@ -507,16 +513,13 @@ int WriteToPartition(unsigned char* data, size_t len, 


                    size_t so_far = 0;

                    while (so_far < to_read) {

                        ssize_t read_count = read(fd, buffer+so_far, to_read-so_far);

                        if (read_count < 0) {

                            if (errno == EINTR) {

                                read_count = 0;

                            } else {

                        ssize_t read_count =

                                TEMP_FAILURE_RETRY(read(fd, buffer+so_far, to_read-so_far));

                        if (read_count == -1) {

                            printf("verify read error %s at %zu: %s\n",

                                   partition, p, strerror(errno));

                            return -1;

                        }

                        }

                        if ((size_t)read_count < to_read) {

                            printf("short verify read %s at %zu: %zd %zu %s\n",

                                   partition, p, read_count, to_read, strerror(errno));
@@ -656,8 +659,8 @@ ssize_t FileSink(const unsigned char* data, ssize_t len, void* token) { 
    ssize_t done = 0;

    ssize_t wrote;

    while (done < (ssize_t) len) {

        wrote = write(fd, data+done, len-done);

        if (wrote <= 0) {

        wrote = TEMP_FAILURE_RETRY(write(fd, data+done, len-done));

        if (wrote == -1) {

            printf("error writing %d bytes: %s\n", (int)(len-done), strerror(errno));

            return done;

        }
@@ -690,7 +693,7 @@ size_t FreeSpaceForFile(const char* filename) { 
        printf("failed to statfs %s: %s\n", filename, strerror(errno));

        return -1;

    }

    return sf.f_bsize * sf.f_bfree;

    return sf.f_bsize * sf.f_bavail;

}



int CacheSizeCheck(size_t bytes) {

applypatch/bspatch.c

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <stdio.h>

#include <sys/stat.h>

#include <errno.h>

#include <malloc.h>

#include <unistd.h>

#include <string.h>