aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Marshall <tdm@cyngn.com>2014-10-07 23:53:29 -0700
committerTom Marshall <tdm@cyngn.com>2014-10-08 00:35:47 -0700
commit11f589a4b6044ffb146b0e901937d8ec722251ed (patch)
tree0990b1f8e3314f7c3f22de6a235e9fdd828990fb
parent650e23e65f67f51c92ffea92f3714827d93be598 (diff)
downloadandroid_external_exfat-staging/cm-12.0-caf.tar.gz
android_external_exfat-staging/cm-12.0-caf.tar.bz2
android_external_exfat-staging/cm-12.0-caf.zip
* Don't require inclusion of a separate package for symlinks. The symlinks should always be present if the main package builds. * Don't depend on anything for symlink targets. Change-Id: Ida6e2f1840f8c011e9764da38b26e2b349682f85
-rw-r--r--Android.mk10
1 files changed, 6 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk
index 02da09f..6483b69 100644
--- a/Android.mk
+++ b/Android.mk
@@ -12,11 +12,12 @@ LOCAL_SRC_FILES := main.c
LOCAL_SHARED_LIBRARIES += libz libc
LOCAL_STATIC_LIBRARIES += libexfat_mount libexfat_fsck libexfat_mkfs
LOCAL_STATIC_LIBRARIES += libexfat libfuse
+SYMLINKS := $(addprefix $(TARGET_OUT)/bin/,$(LINKS))
+LOCAL_ADDITIONAL_DEPENDENCIES := $(SYMLINKS)
include $(BUILD_EXECUTABLE)
-SYMLINKS := $(addprefix $(TARGET_OUT)/bin/,$(LINKS))
$(SYMLINKS): EXFAT_BINARY := $(LOCAL_MODULE)
-$(SYMLINKS): $(LOCAL_INSTALLED_MODULE) $(LOCAL_PATH)/Android.mk
+$(SYMLINKS):
@echo "Symlink: $@ -> $(EXFAT_BINARY)"
@mkdir -p $(dir $@)
@rm -rf $@
@@ -37,11 +38,12 @@ LOCAL_STATIC_LIBRARIES += libz libc
LOCAL_STATIC_LIBRARIES += libexfat_mount libexfat_fsck libexfat_mkfs
LOCAL_STATIC_LIBRARIES += libexfat libfuse
LOCAL_FORCE_STATIC_EXECUTABLE := true
+RECOVERY_SYMLINKS := $(addprefix $(TARGET_RECOVERY_ROOT_OUT)/sbin/,$(LINKS))
+LOCAL_ADDITIONAL_DEPENDENCIES := $(RECOVERY_SYMLINKS)
include $(BUILD_EXECUTABLE)
-RECOVERY_SYMLINKS := $(addprefix $(TARGET_RECOVERY_ROOT_OUT)/sbin/,$(LINKS))
$(RECOVERY_SYMLINKS): EXFAT_BINARY := mount.exfat
-$(RECOVERY_SYMLINKS): $(LOCAL_INSTALLED_MODULE) $(LOCAL_PATH)/Android.mk
+$(RECOVERY_SYMLINKS):
@echo "Symlink: $@ -> $(EXFAT_BINARY)"
@mkdir -p $(dir $@)
@rm -rf $@