commit 4721a5a1a384bbe25552dfefcfb9c2a292b4eeae
author bigbiff <bigbiff@teamw.in> Sun Apr 05 10:32:40 2020 -0400
committer bigbiff <bigbiff@teamw.in> Sun Apr 05 10:32:40 2020 -0400
tree ba7d6653b908f254bb186fdcb9e512ab45871d2d
parent 36f088ac7c2ac6a5c6ceef6bf18f7219f74bcb98

unzip: relink unzip binary from system/bin

Change-Id: I69a8c86c3c817f0a539be53a52f33b8bb6813fdf

prebuilt/Android.mk

diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk
index eba3b30..2b3c051 100755
--- a/prebuilt/Android.mk
+++ b/prebuilt/Android.mk
@@ -44,7 +44,11 @@
         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