unzip: relink unzip binary from system/bin

Change-Id: I69a8c86c3c817f0a539be53a52f33b8bb6813fdf
2020-04-05 10:32:40 -04:00
parent 36f088ac7c
commit 4721a5a1a3
1 changed files with 5 additions and 1 deletions
@@ -44,7 +44,11 @@ ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 23; echo $$?),0)
        RELINK_SOURCE_FILES += $(TARGET_OUT_OPTIONAL_EXECUTABLES)/unzip
    endif
    ifneq ($(wildcard system/core/libziparchive/Android.bp),)
-        RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/unzip
+        ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 29; echo $$?),0)
+            RELINK_SOURCE_FILES += $(TARGET_RECOVERY_ROOT_OUT)/system/bin/unzip
+        else
+            RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/unzip
+        endif
    endif
    ifneq ($(wildcard external/one-true-awk/Android.bp),)
        RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/awk