Build adbd instead of using prebuilt binary

This commit is contained in:
Vojtech Bocek
2014-09-17 18:22:25 +02:00
parent a76c5534a3
commit 87a1a119ca
5 changed files with 9 additions and 1 deletions

3
.gitmodules vendored
View File

@@ -1,3 +1,6 @@
[submodule "kexec-tools"]
path = kexec-tools
url = https://github.com/Tasssadar/kexec-tools
[submodule "adbd"]
path = adbd
url = https://github.com/Tasssadar/multirom_adbd.git

View File

@@ -196,6 +196,9 @@ include $(multirom_local_path)/install_zip/Android.mk
# Kexec-tools
include $(multirom_local_path)/kexec-tools/Android.mk
# adbd
include $(multirom_local_path)/adbd/Android.mk
# We need static libtruetype but it isn't in standard android makefile :(
LOCAL_PATH := external/freetype/
include $(CLEAR_VARS)

1
adbd Submodule

Submodule adbd added at d71d4d86a8

View File

@@ -12,7 +12,7 @@ ifeq ($(MR_FSTAB),)
$(info MR_FSTAB not defined in device files)
endif
$(MULTIROM_ZIP_TARGET): multirom trampoline fw_mounter signapk bbootimg mrom_kexec_static
$(MULTIROM_ZIP_TARGET): multirom trampoline fw_mounter signapk bbootimg mrom_kexec_static mrom_adbd
@echo
@echo
@echo "A crowdfunding campaign for MultiROM took place in 2013. These people got perk 'The Tenth':"
@@ -30,6 +30,7 @@ $(MULTIROM_ZIP_TARGET): multirom trampoline fw_mounter signapk bbootimg mrom_kex
cp -a $(TARGET_ROOT_OUT)/trampoline $(MULTIROM_INST_DIR)/multirom/
cp -a $(TARGET_ROOT_OUT)/fw_mounter $(MULTIROM_INST_DIR)/multirom/
cp -a $(TARGET_OUT_OPTIONAL_EXECUTABLES)/mrom_kexec_static $(MULTIROM_INST_DIR)/multirom/kexec
cp -a $(TARGET_OUT_OPTIONAL_EXECUTABLES)/mrom_adbd $(MULTIROM_INST_DIR)/multirom/adbd
mkdir $(MULTIROM_INST_DIR)/multirom/infos
if [ -n "$(MR_INFOS)" ]; then cp -r $(PWD)/$(MR_INFOS)/* $(MULTIROM_INST_DIR)/multirom/infos/; fi
cp -a $(TARGET_OUT_OPTIONAL_EXECUTABLES)/bbootimg $(MULTIROM_INST_DIR)/scripts/