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

Commit 20531ef6 authored by Elliott Hughes's avatar Elliott Hughes
Browse files

Switch minadb over to C++. 

Change-Id: I5afaf70caa590525627c676c88b445d3162de33e
parent 23017c5d

adb_install.cpp

+0 −2
Original line number Diff line number Diff line
@@ -30,10 +30,8 @@ 
#include "install.h"

#include "common.h"

#include "adb_install.h"

extern "C" {

#include "minadbd/fuse_adb_provider.h"

#include "fuse_sideload.h"

}



static RecoveryUI* ui = NULL;

fuse_sdcard_provider.h

+6 −0
Original line number Diff line number Diff line
@@ -17,7 +17,13 @@ 
#ifndef __FUSE_SDCARD_PROVIDER_H

#define __FUSE_SDCARD_PROVIDER_H



#include <sys/cdefs.h>



__BEGIN_DECLS



void* start_sdcard_fuse(const char* path);

void finish_sdcard_fuse(void* token);



__END_DECLS



#endif

fuse_sideload.h

+6 −0
Original line number Diff line number Diff line
@@ -17,6 +17,10 @@ 
#ifndef __FUSE_SIDELOAD_H

#define __FUSE_SIDELOAD_H



#include <sys/cdefs.h>



__BEGIN_DECLS



// define the filenames created by the sideload FUSE filesystem

#define FUSE_SIDELOAD_HOST_MOUNTPOINT "/sideload"

#define FUSE_SIDELOAD_HOST_FILENAME "package.zip"
@@ -35,4 +39,6 @@ struct provider_vtab { 
int run_fuse_sideload(struct provider_vtab* vtab, void* cookie,

                      uint64_t file_size, uint32_t block_size);



__END_DECLS



#endif

minadbd/Android.mk

+3 −3
Original line number Diff line number Diff line
@@ -11,9 +11,9 @@ minadbd_cflags := \ 
include $(CLEAR_VARS)



LOCAL_SRC_FILES := \

    adb_main.c \

    fuse_adb_provider.c \

    services.c \

    adb_main.cpp \

    fuse_adb_provider.cpp \

    services.cpp \



LOCAL_MODULE := libminadbd

LOCAL_CFLAGS := $(minadbd_cflags)

minadbd/adb_main.c→minadbd/adb_main.cpp

+0 −0

File moved.

View file