From 463cbceb076f7dbcbedb6ee246c8cfb079550948 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Tue, 28 Feb 2017 17:50:40 +0800
Subject: [PATCH] Cleanup Android.mk

---
 jni/Application.mk        | 1 -
 jni/magiskboot/Android.mk | 3 +--
 jni/magiskhide/Android.mk | 2 --
 jni/resetprop/Android.mk  | 1 -
 jni/selinux               | 2 +-
 jni/sepolicy-inject       | 2 +-
 jni/su                    | 2 +-
 7 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/jni/Application.mk b/jni/Application.mk
index 8ebf9243b..ec94853b3 100644
--- a/jni/Application.mk
+++ b/jni/Application.mk
@@ -1,4 +1,3 @@
 APP_ABI := x86 x86_64 armeabi-v7a arm64-v8a
-APP_PIE = true
 APP_PLATFORM := android-21
 APP_CPPFLAGS += -std=c++11
diff --git a/jni/magiskboot/Android.mk b/jni/magiskboot/Android.mk
index bef4f2558..3d9bc7657 100644
--- a/jni/magiskboot/Android.mk
+++ b/jni/magiskboot/Android.mk
@@ -2,8 +2,7 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := magiskboot
-LOCAL_MODULE_TAGS := optional
+LOCAL_STATIC_LIBRARIES := liblzma
 LOCAL_SRC_FILES := main.c unpack.c repack.c hexpatch.c parseimg.c compress.c
-LOCAL_CFLAGS += -std=gnu11
 LOCAL_LDLIBS += -lz
 include $(BUILD_EXECUTABLE)
diff --git a/jni/magiskhide/Android.mk b/jni/magiskhide/Android.mk
index 50d2a162a..3238aea9f 100644
--- a/jni/magiskhide/Android.mk
+++ b/jni/magiskhide/Android.mk
@@ -2,7 +2,5 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := magiskhide
-LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := main.c hide.c list_monitor.c proc_monitor.c util.c
-LOCAL_CFLAGS += -std=gnu11 -O3
 include $(BUILD_EXECUTABLE)
\ No newline at end of file
diff --git a/jni/resetprop/Android.mk b/jni/resetprop/Android.mk
index bc29e4892..e3c49bd9a 100644
--- a/jni/resetprop/Android.mk
+++ b/jni/resetprop/Android.mk
@@ -2,7 +2,6 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := resetprop
-LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := resetprop.cpp system_properties.cpp libc_logging.cpp
 LOCAL_LDLIBS += -latomic
 include $(BUILD_EXECUTABLE)
diff --git a/jni/selinux b/jni/selinux
index a96d57f47..d7c6efa17 160000
--- a/jni/selinux
+++ b/jni/selinux
@@ -1 +1 @@
-Subproject commit a96d57f47efd2a7dff0d12188ef77058d6177257
+Subproject commit d7c6efa178620474c0de1d5caefb991a94c537c5
diff --git a/jni/sepolicy-inject b/jni/sepolicy-inject
index 32d2df0f0..2fe4d9706 160000
--- a/jni/sepolicy-inject
+++ b/jni/sepolicy-inject
@@ -1 +1 @@
-Subproject commit 32d2df0f08a2f23e53e2f0763b714154961a9456
+Subproject commit 2fe4d9706148d19c4ff2dce9119f40ae0641925a
diff --git a/jni/su b/jni/su
index 9f46330c9..12cc7b788 160000
--- a/jni/su
+++ b/jni/su
@@ -1 +1 @@
-Subproject commit 9f46330c968803f69e6132961fba559be5c8876a
+Subproject commit 12cc7b7885c67b17340b4637b67e190148927a7e