From 2d11d498caeb2e12eef54a1a797f46fe77a0a776 Mon Sep 17 00:00:00 2001
From: Ethan Yonker <dees_troy@teamw.in>
Date: Fri, 12 Dec 2014 11:43:21 -0600
Subject: Fix compiling of dosfstools for arm64

Change-Id: If99d0be4b73cdeb388c6cb1b35a215d3b8b3b58d
---
 Android.mk | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

(limited to 'Android.mk')

diff --git a/Android.mk b/Android.mk
index 2a108777f..203c901de 100644
--- a/Android.mk
+++ b/Android.mk
@@ -312,14 +312,13 @@ LOCAL_ADDITIONAL_DEPENDENCIES := \
     teamwin \
     toolbox_symlinks \
     twrp \
-    unpigz_symlink
+    unpigz_symlink \
+    dosfsck \
+    dosfslabel \
+    fsck_msdos_symlink \
+    mkdosfs
 
 ifneq ($(TARGET_ARCH), arm64)
-    LOCAL_ADDITIONAL_DEPENDENCIES += \
-        dosfsck \
-        dosfslabel \
-        fsck_msdos_symlink \
-        mkdosfs
     LOCAL_LDFLAGS += -Wl,-dynamic-linker,/sbin/linker
 else
     LOCAL_LDFLAGS += -Wl,-dynamic-linker,/sbin/linker64
@@ -487,11 +486,8 @@ include $(commands_recovery_local_path)/injecttwrp/Android.mk \
     $(commands_recovery_local_path)/libmincrypt/Android.mk \
     $(commands_recovery_local_path)/twrpTarMain/Android.mk \
     $(commands_recovery_local_path)/mtp/Android.mk \
-    $(commands_recovery_local_path)/minzip/Android.mk
-
-ifneq ($(TARGET_ARCH), arm64)
-    include $(commands_recovery_local_path)/dosfstools/Android.mk
-endif
+    $(commands_recovery_local_path)/minzip/Android.mk \
+    $(commands_recovery_local_path)/dosfstools/Android.mk
 
 ifeq ($(TW_INCLUDE_CRYPTO), true)
     include $(commands_recovery_local_path)/crypto/lollipop/Android.mk
-- 
cgit v1.2.3