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

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

Merge up to android-8.1.0_r1 and fix conflicts 

Change-Id: I2dc060134d15ec9f015a606cb24ef8276f6af1fc
parents ea4efc6d 435a2031

Android.bp

0 → 100644
+4 −0
Original line number Diff line number Diff line 
subdirs = [

//    "bootloader_message",

//    "otautil",

]

Android.mk

+58 −11
Original line number Diff line number Diff line
@@ -590,7 +590,7 @@ endif 
include $(CLEAR_VARS)

LOCAL_SRC_FILES := fuse_sideload.cpp

LOCAL_CLANG := true

LOCAL_CFLAGS := -O2 -g -DADB_HOST=0 -Wall -Wno-unused-parameter

LOCAL_CFLAGS := -Wall -Werror

LOCAL_CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE



LOCAL_MODULE_TAGS := optional
@@ -605,13 +605,35 @@ else 
endif

include $(BUILD_SHARED_LIBRARY)



# static libfusesideload

# =============================== (required to fix build errors in 8.1 due to use by tests)

include $(CLEAR_VARS)

LOCAL_SRC_FILES := fuse_sideload.cpp

LOCAL_CLANG := true

LOCAL_CFLAGS := -Wall -Werror

LOCAL_CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE



LOCAL_MODULE_TAGS := optional

LOCAL_MODULE := libfusesideload

LOCAL_SHARED_LIBRARIES := libcutils libc

ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 24; echo $$?),0)

    LOCAL_C_INCLUDES := $(LOCAL_PATH)/libmincrypt/includes

    LOCAL_STATIC_LIBRARIES += libmincrypttwrp

    LOCAL_CFLAGS += -DUSE_MINCRYPT

else

    LOCAL_STATIC_LIBRARIES += libcrypto_static

endif

include $(BUILD_STATIC_LIBRARY)



# libmounts (static library)

# ===============================

include $(CLEAR_VARS)

LOCAL_SRC_FILES := mounts.cpp

LOCAL_CLANG := true

LOCAL_CFLAGS := -Wall -Wno-unused-parameter -Werror

LOCAL_CFLAGS := \

    -Wall \

    -Werror

LOCAL_MODULE := libmounts

LOCAL_STATIC_LIBRARIES := libbase

include $(BUILD_STATIC_LIBRARY)



# librecovery (static library)
@@ -619,7 +641,7 @@ include $(BUILD_STATIC_LIBRARY) 
include $(CLEAR_VARS)

LOCAL_SRC_FILES := \

    install.cpp

LOCAL_CFLAGS := -Wno-unused-parameter -Werror

LOCAL_CFLAGS := -Wall -Werror

LOCAL_CFLAGS += -DRECOVERY_API_VERSION=$(RECOVERY_API_VERSION)



ifeq ($(AB_OTA_UPDATER),true)
@@ -632,7 +654,8 @@ LOCAL_STATIC_LIBRARIES := \ 
    libvintf_recovery \

    libcrypto_utils \

    libcrypto \

    libbase

    libbase \

    libziparchive \



include $(BUILD_STATIC_LIBRARY)
@@ -661,6 +684,7 @@ else 
    LOCAL_SHARED_LIBRARIES += libcrypto libbase

    LOCAL_SRC_FILES += verifier.cpp asn1_decoder.cpp

endif



ifeq ($(AB_OTA_UPDATER),true)

    LOCAL_CFLAGS += -DAB_OTA_UPDATER=1

endif
@@ -679,7 +703,6 @@ include $(BUILD_SHARED_LIBRARY) 
include $(CLEAR_VARS)

LOCAL_CLANG := true

LOCAL_MODULE := libverifier

LOCAL_MODULE_TAGS := tests

LOCAL_SRC_FILES := \

    asn1_decoder.cpp \

    verifier.cpp \
@@ -687,16 +710,40 @@ LOCAL_SRC_FILES := \ 
LOCAL_STATIC_LIBRARIES := libcrypto_static

include $(BUILD_STATIC_LIBRARY)



# Wear default device

# ===============================

include $(CLEAR_VARS)

LOCAL_SRC_FILES := wear_device.cpp



# Should match TARGET_RECOVERY_UI_LIB in BoardConfig.mk.

LOCAL_MODULE := librecovery_ui_wear



include $(BUILD_STATIC_LIBRARY)



# vr headset default device

# ===============================

include $(CLEAR_VARS)



LOCAL_SRC_FILES := vr_device.cpp



# should match TARGET_RECOVERY_UI_LIB set in BoardConfig.mk

LOCAL_MODULE := librecovery_ui_vr



include $(BUILD_STATIC_LIBRARY)



commands_recovery_local_path := $(LOCAL_PATH)

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

    $(LOCAL_PATH)/tools/Android.mk \



include \

    $(LOCAL_PATH)/applypatch/Android.mk \

    $(LOCAL_PATH)/boot_control/Android.mk \

    $(LOCAL_PATH)/edify/Android.mk \

    $(LOCAL_PATH)/otafault/Android.mk \

    $(LOCAL_PATH)/bootloader_message/Android.mk \

    $(LOCAL_PATH)/bootloader_message_twrp/Android.mk \

    $(LOCAL_PATH)/tests/Android.mk \

    $(LOCAL_PATH)/tools/Android.mk \

    $(LOCAL_PATH)/updater/Android.mk \

    $(LOCAL_PATH)/update_verifier/Android.mk \

    $(LOCAL_PATH)/applypatch/Android.mk

    $(LOCAL_PATH)/bootloader_message/Android.mk \

    $(LOCAL_PATH)/bootloader_message_twrp/Android.mk



ifeq ($(wildcard system/core/uncrypt/Android.mk),)

    include $(commands_recovery_local_path)/uncrypt/Android.mk

OWNERS

0 → 100644
+3 −0
Original line number Diff line number Diff line 
enh+aosp-gerrit@google.com

tbao@google.com

xunchang@google.com

adb_install.cpp

+138 −130
Original line number Diff line number Diff line
@@ -14,24 +14,27 @@ 
 * limitations under the License.

 */



#include <unistd.h>

#include "adb_install.h"



#include <dirent.h>

#include <errno.h>

#include <fcntl.h>

#include <signal.h>

#include <stdlib.h>

#include <string.h>

#include <sys/stat.h>

#include <sys/types.h>

#include <sys/wait.h>

#include <sys/stat.h>

#include <signal.h>

#include <fcntl.h>

#include <stdio.h>

#include <unistd.h>



#include "ui.h"

#include "cutils/properties.h"

#include "install.h"



#include "common.h"

#include "adb_install.h"

#include "minadbd/fuse_adb_provider.h"

#include "fuse_sideload.h"

#ifdef USE_OLD_VERIFIER

#include "verifier24/verifier.h"
@@ -40,6 +43,11 @@ 
#endif



static void set_usb_driver(bool enabled) {

  char configfs[PROPERTY_VALUE_MAX];

  property_get("sys.usb.configfs", configfs, "false");

  if (strcmp(configfs, "false") == 0 || strcmp(configfs, "0") == 0)

    return;



  int fd = open("/sys/class/android_usb/android0/enable", O_WRONLY);

  if (fd < 0) {

/*  These error messages show when built in older Android branches (e.g. Gingerbread)
@@ -200,7 +208,7 @@ int apply_from_adb(RecoveryUI* ui, bool* wipe_cache, const char* install_file) { 
      printf("\nYou need adb 1.0.32 or newer to sideload\nto this device.\n\n");

      result = -2;

    } else if (!WIFSIGNALED(status)) {

            printf("status %d\n", WEXITSTATUS(status));

      printf("adbd status %d\n", WEXITSTATUS(status));

    }

  }

adb_install.h

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
#ifndef _ADB_INSTALL_H

#define _ADB_INSTALL_H



#include <sys/types.h>



//class RecoveryUI;



static void set_usb_driver(bool enabled);