diff options
| -rwxr-xr-x | Android.mk | 5 | ||||
| -rw-r--r-- | toolbox/Android.mk | 6 | ||||
| -rw-r--r-- | toybox/Android.mk | 6 |
3 files changed, 2 insertions, 15 deletions
diff --git a/Android.mk b/Android.mk index ba2f367da..7ffcd70aa 100755 --- 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 index 986b7a4ec..926743850 100644 --- 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 index 0850d5845..5f6edec3f 100644 --- 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 |