sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

system/adb: Download the last version of microADB

Browse Source 
commit aa9c64896c7d47478656928d4dcf9b1a5e346da7
Author: Xiang Xiao <xiaoxiang@xiaomi.com>
Date:   Sat Jan 22 16:41:23 2022 +0800

    remove NuttX special code

    since the new libuv porting for NuttX doesn't need the special process

    Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2022-03-03 02:39:11 +08:00 committed by Petro Karashchenko
parent 29374c96c3
commit 02a095bb76
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
system/adb/Makefile
View File

@ -20,21 +20,19 @@
include $(APPDIR)/Make.defs
ADB_DIR := $(APPDIR)/system/adb
CONFIG_ADBD_URL ?= "https://github.com/spiriou/microADB.git"
CONFIG_ADBD_VERSION ?= b7025c67b866925d1e64c016a844a6a3392557a4
ADBD_URL ?= "https://github.com/spiriou/microADB/archive"
ADBD_VERSION ?= a1a12e2452eed9d8fdd008c05b4d93c992bfc0a7
ADB_DIR := $(APPDIR)/system/adb
ADB_UNPACKNAME := microADB
ADB_UNPACKDIR := $(ADB_DIR)/$(ADB_UNPACKNAME)
$(ADB_UNPACKDIR):
@echo "Downloading: $(ADB_UNPACKNAME)"
$(call DELDIR, "$@")
$(Q) mkdir "$@"
$(Q) cd "$@" && git init && \
git remote add origin "$(CONFIG_ADBD_URL)" && \
git fetch origin $(CONFIG_ADBD_VERSION) --depth=1 && \
git reset --hard FETCH_HEAD
$(Q) curl -O -L $(ADBD_URL)/$(ADBD_VERSION).zip
$(Q) unzip -o $(ADBD_VERSION).zip
$(call DELFILE, $(ADBD_VERSION).zip)
$(call MOVEFILE, $(ADB_UNPACKNAME)-$(ADBD_VERSION), $(ADB_UNPACKDIR))
# adb server app

2
system/adb/logcat_service.c
View File

@ -105,7 +105,7 @@ static const adb_service_ops_t logcat_ops =
.on_write_frame = alog_on_write,
.on_ack_frame = alog_on_ack,
.on_kick = alog_on_kick,
.close = alog_close
.on_close = alog_close
};
static void logcat_on_data_available(uv_poll_t * handle,