diff options
| author | Tom Marshall <tdm@cyngn.com> | 2015-12-14 10:49:00 -0800 |
|---|---|---|
| committer | Tom Marshall <tdm@cyngn.com> | 2016-02-04 13:23:01 -0800 |
| commit | cea50b7a2c400918f59d3cfaf9c380741383e07c (patch) | |
| tree | a012aef2702fbb32d26bcf70c88d7d8534042501 | |
| parent | 864493c7697818028869ea457e649649af54656b (diff) | |
| download | bootable_recovery-cea50b7a2c400918f59d3cfaf9c380741383e07c.tar.gz bootable_recovery-cea50b7a2c400918f59d3cfaf9c380741383e07c.tar.bz2 bootable_recovery-cea50b7a2c400918f59d3cfaf9c380741383e07c.zip | |
recovery: Fix dependencies
* Do not require recovery binary to make toybox symlinks. It is not
necessary and provokes a circular dependency warning from make.
* Do not declare toybox symlinks and bu_recovery as additional
dependencies when in one-shot mode. This allows incremental
rebuilding of the recovery binary.
Change-Id: I5ba815ebd4ce5981f8be316ec5ab77272ff565cc
| -rw-r--r-- | Android.mk | 10 |
1 files changed, 4 insertions, 6 deletions
@@ -156,15 +156,13 @@ LOCAL_C_INCLUDES += external/boringssl/include ifeq ($(ONE_SHOT_MAKEFILE),) LOCAL_ADDITIONAL_DEPENDENCIES += \ fstools \ - recovery_mkshrc + recovery_mkshrc \ + bu_recovery \ + toybox_recovery_links endif -LOCAL_ADDITIONAL_DEPENDENCIES += \ - bu_recovery - TOYBOX_INSTLIST := $(HOST_OUT_EXECUTABLES)/toybox-instlist -LOCAL_ADDITIONAL_DEPENDENCIES += toybox_recovery_links # Set up the static symlinks RECOVERY_TOOLS := \ @@ -179,7 +177,7 @@ endif include $(BUILD_EXECUTABLE) # Run toybox-instlist and generate the rest of the symlinks -toybox_recovery_links: $(TOYBOX_INSTLIST) recovery +toybox_recovery_links: $(TOYBOX_INSTLIST) toybox_recovery_links: TOY_LIST=$(shell $(TOYBOX_INSTLIST)) toybox_recovery_links: TOYBOX_BINARY := $(TARGET_RECOVERY_ROOT_OUT)/sbin/toybox toybox_recovery_links: |