Fix symlink creation

Change-Id: I0d0bcdde2957974eb357a6f3d820bd5ab0fa47ee
omnirom · May 24, 2019 · ae7ff3b · ae7ff3b
1 parent abf1fb0
commit ae7ff3b
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 15 deletions.
diff --git a/Android.mk b/Android.mk
@@ -583,11 +583,6 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := busybox_symlinks
 LOCAL_MODULE_TAGS := optional
 LOCAL_ADDITIONAL_DEPENDENCIES := $(RECOVERY_BUSYBOX_SYMLINKS)
-ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 28; echo $$?),0)
-    LOCAL_REQUIRED_MODULES := $(RECOVERY_BUSYBOX_SYMLINKS)
-else
-    LOCAL_ADDITIONAL_DEPENDENCIES := $(RECOVERY_BUSYBOX_SYMLINKS)
-endif
 ifneq (,$(filter $(PLATFORM_SDK_VERSION),16 17 18))
 ALL_DEFAULT_INSTALLED_MODULES += $(RECOVERY_BUSYBOX_SYMLINKS)
 endif

diff --git a/toolbox/Android.mk b/toolbox/Android.mk
@@ -307,11 +307,7 @@ $(SYMLINKS): $(LOCAL_INSTALLED_MODULE)
 include $(CLEAR_VARS)
 LOCAL_MODULE := toolbox_symlinks
 LOCAL_MODULE_TAGS := optional
-ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 28; echo $$?),0)
-    LOCAL_REQUIRED_MODULES := $(SYMLINKS)
-else
-    LOCAL_ADDITIONAL_DEPENDENCIES := $(SYMLINKS)
-endif
+LOCAL_ADDITIONAL_DEPENDENCIES := $(SYMLINKS)
 include $(BUILD_PHONY_PACKAGE)
 
 ifneq (,$(filter $(PLATFORM_SDK_VERSION),16 17 18))

diff --git a/toybox/Android.mk b/toybox/Android.mk
@@ -585,11 +585,7 @@ $(SYMLINKS): $(LOCAL_INSTALLED_MODULE) $(LOCAL_PATH)/Android.mk
 include $(CLEAR_VARS)
 LOCAL_MODULE := toybox_symlinks
 LOCAL_MODULE_TAGS := optional
-ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 28; echo $$?),0)
-    LOCAL_REQUIRED_MODULES := $(SYMLINKS)
-else
-    LOCAL_ADDITIONAL_DEPENDENCIES := $(SYMLINKS)
-endif
+LOCAL_ADDITIONAL_DEPENDENCIES := $(SYMLINKS)
 include $(BUILD_PHONY_PACKAGE)
 
 endif