Skip to content

Commit

Permalink
Build adbd instead of using prebuilt binary
Browse files Browse the repository at this point in the history
  • Loading branch information
Tasssadar committed Sep 27, 2014
1 parent a76c553 commit 87a1a11
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 1 deletion.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -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
3 changes: 3 additions & 0 deletions Android.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions adbd
Submodule adbd added at d71d4d
3 changes: 2 additions & 1 deletion install_zip/Android.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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':"
Expand All @@ -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/
Expand Down
Binary file removed install_zip/prebuilt-installer/multirom/adbd
Binary file not shown.

0 comments on commit 87a1a11

Please sign in to comment.