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

Commit fe685787 authored by Dan Albert's avatar Dan Albert Committed by Gerrit Code Review
Browse files

Merge "Fix userdebug build."

parents accebbfc 030b76fc

adb/Android.mk

+3 −0
Original line number Diff line number Diff line
@@ -161,14 +161,17 @@ LOCAL_MODULE := adbd 
LOCAL_FORCE_STATIC_EXECUTABLE := true

LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT_SBIN)

LOCAL_UNSTRIPPED_PATH := $(TARGET_ROOT_OUT_SBIN_UNSTRIPPED)

LOCAL_C_INCLUDES += system/extras/ext4_utils system/core/fs_mgr/include



LOCAL_STATIC_LIBRARIES := \

    libadb \

    libfs_mgr \

    liblog \

    libcutils \

    libc \

    libmincrypt \

    libselinux \

    libext4_utils_static \



LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk

adb/set_verity_enable_state_service.c

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ 
#include <inttypes.h>



#include "cutils/properties.h"

#include "ext4_sb.h"

#include <fs_mgr.h>



#define FSTAB_PREFIX "/fstab."

struct fstab *fstab;