From b82422a6c354215118316f58781da4f5354406cc Mon Sep 17 00:00:00 2001
From: Ethan Yonker <dees_troy@teamw.in>
Date: Wed, 20 Jan 2016 08:48:49 -0600
Subject: Fix SuperSU local dependencies

Change-Id: Ia5fadd8254340b21a54565e2c7d2b54aa70f19f3
---
 Android.mk          |  10 +++++++++-
 prebuilt/Android.mk |   3 ++-
 prebuilt/su         | Bin 75364 -> 0 bytes
 prebuilt/suarm      | Bin 0 -> 75364 bytes
 4 files changed, 11 insertions(+), 2 deletions(-)
 delete mode 100644 prebuilt/su
 create mode 100644 prebuilt/suarm

diff --git a/Android.mk b/Android.mk
index 0ac82ba99..3bed65081 100644
--- a/Android.mk
+++ b/Android.mk
@@ -390,7 +390,15 @@ ifeq ($(TW_INCLUDE_DUMLOCK), true)
 endif
 ifneq ($(TW_EXCLUDE_SUPERSU), true)
     LOCAL_ADDITIONAL_DEPENDENCIES += \
-        su install-recovery.sh 99SuperSUDaemon Superuser.apk
+        install-recovery.sh 99SuperSUDaemon Superuser.apk
+    ifeq ($(TARGET_ARCH), arm)
+        LOCAL_ADDITIONAL_DEPENDENCIES += \
+            chattr.pie libsupol.so suarm supolicy
+    endif
+    ifeq ($(TARGET_ARCH), arm64)
+        LOCAL_ADDITIONAL_DEPENDENCIES += \
+            libsupol.soarm64 suarm64 supolicyarm64
+    endif
 endif
 ifneq ($(TW_NO_EXFAT_FUSE), true)
     LOCAL_ADDITIONAL_DEPENDENCIES += exfat-fuse
diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk
index 81954257c..4ea7e71c8 100644
--- a/prebuilt/Android.mk
+++ b/prebuilt/Android.mk
@@ -374,7 +374,8 @@ ifneq ($(TW_EXCLUDE_SUPERSU), true)
 
 		#su binary
 		include $(CLEAR_VARS)
-		LOCAL_MODULE := su
+		LOCAL_MODULE := suarm
+		LOCAL_MODULE_STEM := su
 		LOCAL_MODULE_TAGS := eng
 		LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES
 		LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/supersu
diff --git a/prebuilt/su b/prebuilt/su
deleted file mode 100644
index 38679b4ac..000000000
Binary files a/prebuilt/su and /dev/null differ
diff --git a/prebuilt/suarm b/prebuilt/suarm
new file mode 100644
index 000000000..38679b4ac
Binary files /dev/null and b/prebuilt/suarm differ
-- 
cgit v1.2.3