From 99406f2099fa0406142e9a625afc174aae2ac08d Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Fri, 30 Dec 2016 06:06:19 +0800
Subject: [PATCH] Separate all Android.mk files

---
 jni/Android.mk      | 31 ++++---------------------------
 jni/Application.mk  |  2 --
 jni/resetprop       |  2 +-
 jni/sepolicy-inject |  2 +-
 jni/su              |  2 +-
 5 files changed, 7 insertions(+), 32 deletions(-)

diff --git a/jni/Android.mk b/jni/Android.mk
index 71e16e263..b6d1d5f16 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -1,6 +1,4 @@
-my_path := $(call my-dir)
-
-LOCAL_PATH := $(my_path)
+LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := magiskhide
@@ -16,30 +14,9 @@ LOCAL_SRC_FILES := bootimgtools/main.c bootimgtools/extract.c bootimgtools/repac
 LOCAL_CFLAGS += -std=gnu11
 include $(BUILD_EXECUTABLE)
 
-include $(CLEAR_VARS)
-LOCAL_MODULE := sepolicy-inject
-LOCAL_MODULE_TAGS := optional
-LOCAL_STATIC_LIBRARIES := libsepol
-LOCAL_SRC_FILES := sepolicy-inject/sepolicy-inject.c sepolicy-inject/builtin_rules.c
-LOCAL_C_INCLUDES := jni/selinux/libsepol/include/
-LOCAL_CFLAGS += -std=gnu11
-include $(BUILD_EXECUTABLE)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := resetprop
-LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := resetprop/resetprop.cpp resetprop/system_properties.cpp resetprop/libc_logging.cpp
-LOCAL_LDLIBS += -latomic
-include $(BUILD_EXECUTABLE)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := su
-LOCAL_MODULE_TAGS := eng debug optional
-LOCAL_STATIC_LIBRARIES := libselinux
-LOCAL_C_INCLUDES := jni/selinux/libselinux/include/ jni/selinux/libsepol/include/ jni/su/sqlite3/
-LOCAL_SRC_FILES := su/su.c su/daemon.c su/activity.c su/db.c su/utils.c su/pts.c su/hacks.c su/binds.c su/sqlite3/sqlite3.c
-LOCAL_CFLAGS := -DSQLITE_OMIT_LOAD_EXTENSION -std=gnu11
-include $(BUILD_EXECUTABLE)
+include jni/resetprop/Android.mk
+include jni/sepolicy-inject/Android.mk
+include jni/su/Android.mk
 
 include jni/selinux/libsepol/Android.mk
 include jni/selinux/libselinux/Android.mk
diff --git a/jni/Application.mk b/jni/Application.mk
index 139340d3b..85c081997 100644
--- a/jni/Application.mk
+++ b/jni/Application.mk
@@ -1,6 +1,4 @@
-NDK_TOOLCHAIN_VERSION=4.9
 APP_ABI := x86 x86_64 armeabi arm64-v8a
 APP_PIE = true
 APP_PLATFORM := android-21
 APP_CPPFLAGS += -std=c++11
-# APP_STL := c++_static
diff --git a/jni/resetprop b/jni/resetprop
index 96949566f..5bafa01da 160000
--- a/jni/resetprop
+++ b/jni/resetprop
@@ -1 +1 @@
-Subproject commit 96949566fb99b2b74b9bb80398ea45ee90ceb592
+Subproject commit 5bafa01da8ea6c82742f96673a89dd6ca668372d
diff --git a/jni/sepolicy-inject b/jni/sepolicy-inject
index f760a9d0c..7dea68271 160000
--- a/jni/sepolicy-inject
+++ b/jni/sepolicy-inject
@@ -1 +1 @@
-Subproject commit f760a9d0c2fb86786d880c72b83d82d16cb35301
+Subproject commit 7dea682713cc81532291c8e8365b13b5a592e9c6
diff --git a/jni/su b/jni/su
index 8475cecfe..7b1d3cf08 160000
--- a/jni/su
+++ b/jni/su
@@ -1 +1 @@
-Subproject commit 8475cecfeb47fbc596898fb9fb296b5027bdc46b
+Subproject commit 7b1d3cf08e3376983837242e74f9d220bbbcc7cb