From 16d7ae62bdcfaaabd8b25c3cd58e38cd88055e59 Mon Sep 17 00:00:00 2001 From: topjohnwu Date: Tue, 6 Dec 2016 03:09:15 +0800 Subject: [PATCH] Move selinux submodule --- .gitmodules | 6 +++--- jni/Android.mk | 4 ++-- selinux => jni/selinux | 0 3 files changed, 5 insertions(+), 5 deletions(-) rename selinux => jni/selinux (100%) diff --git a/.gitmodules b/.gitmodules index f2eff66b1..ef6b59806 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,9 @@ -[submodule "selinux"] - path = selinux - url = https://github.com/topjohnwu/selinux [submodule "jni/sepolicy-inject"] path = jni/sepolicy-inject url = https://github.com/topjohnwu/sepolicy-inject [submodule "jni/resetprop"] path = jni/resetprop url = https://github.com/topjohnwu/resetprop.git +[submodule "jni/selinux"] + path = jni/selinux + url = https://github.com/topjohnwu/selinux.git diff --git a/jni/Android.mk b/jni/Android.mk index c3711d678..d52c713d6 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -21,7 +21,7 @@ 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 := selinux/libsepol/include/ +LOCAL_C_INCLUDES := $(my_path)/selinux/libsepol/include/ LOCAL_CFLAGS += -std=gnu11 include $(BUILD_EXECUTABLE) @@ -32,4 +32,4 @@ LOCAL_SRC_FILES := resetprop/resetprop.cpp resetprop/system_properties.cpp reset LOCAL_LDLIBS += -latomic include $(BUILD_EXECUTABLE) -include selinux/libsepol/Android.mk +include $(my_path)/selinux/libsepol/Android.mk diff --git a/selinux b/jni/selinux similarity index 100% rename from selinux rename to jni/selinux