diff options
| author | Ying Wang <wangying@google.com> | 2014-11-25 19:57:05 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-25 19:57:05 +0000 |
| commit | 29e3fa7eb94e6f601c1bdc722f503820e9b868f0 (patch) | |
| tree | ce95756ab90944f6143a4c6d313cddb603997a98 /init | |
| parent | 6c51d3f2796c9379bed4ef3dc38d141e9a4394ff (diff) | |
| parent | 406f00a87f2337585f59029c05692a9a0e44c698 (diff) | |
| download | system_core-29e3fa7eb94e6f601c1bdc722f503820e9b868f0.zip system_core-29e3fa7eb94e6f601c1bdc722f503820e9b868f0.tar.gz system_core-29e3fa7eb94e6f601c1bdc722f503820e9b868f0.tar.bz2 | |
am 406f00a8: am 8d698179: Merge "Use LOCAL_POST_INSTALL_CMD to simplify symlink creation."
* commit '406f00a87f2337585f59029c05692a9a0e44c698':
Use LOCAL_POST_INSTALL_CMD to simplify symlink creation.
Diffstat (limited to 'init')
| -rw-r--r-- | init/Android.mk | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/init/Android.mk b/init/Android.mk index 72c2272..8cda879 100644 --- a/init/Android.mk +++ b/init/Android.mk @@ -51,25 +51,9 @@ LOCAL_STATIC_LIBRARIES := \ libmincrypt \ libext4_utils_static -LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk +# Create symlinks +LOCAL_POST_INSTALL_CMD := $(hide) mkdir -p $(TARGET_ROOT_OUT)/sbin; \ + ln -sf ../init $(TARGET_ROOT_OUT)/sbin/ueventd; \ + ln -sf ../init $(TARGET_ROOT_OUT)/sbin/watchdogd include $(BUILD_EXECUTABLE) - -# Make a symlink from /sbin/ueventd and /sbin/watchdogd to /init -SYMLINKS := \ - $(TARGET_ROOT_OUT)/sbin/ueventd \ - $(TARGET_ROOT_OUT)/sbin/watchdogd - -$(SYMLINKS): INIT_BINARY := $(LOCAL_MODULE) -$(SYMLINKS): $(LOCAL_INSTALLED_MODULE) $(LOCAL_PATH)/Android.mk - @echo "Symlink: $@ -> ../$(INIT_BINARY)" - @mkdir -p $(dir $@) - @rm -rf $@ - $(hide) ln -sf ../$(INIT_BINARY) $@ - -ALL_DEFAULT_INSTALLED_MODULES += $(SYMLINKS) - -# We need this so that the installed files could be picked up based on the -# local module name -ALL_MODULES.$(LOCAL_MODULE).INSTALLED := \ - $(ALL_MODULES.$(LOCAL_MODULE).INSTALLED) $(SYMLINKS) |