From cdfb06f55394d68a7df1110d83070961a2cc52aa Mon Sep 17 00:00:00 2001
From: Alice Chu <alice.chu@sta.samsung.com>
Date: Thu, 1 Nov 2012 11:33:04 -0700
Subject: [PATCH] Moved Android policy tools to tools directory

Change-Id: I57b0dd9f8071eae492020f410c87f465ba820711
---
 Android.mk                           | 16 ++--------------
 check_seapp/Android.mk               | 15 ---------------
 tools/Android.mk                     | 24 ++++++++++++++++++++++++
 {check_seapp => tools}/check_seapp.c |  0
 checkfc.c => tools/checkfc.c         |  0
 5 files changed, 26 insertions(+), 29 deletions(-)
 delete mode 100644 check_seapp/Android.mk
 create mode 100644 tools/Android.mk
 rename {check_seapp => tools}/check_seapp.c (100%)
 rename checkfc.c => tools/checkfc.c (100%)

diff --git a/Android.mk b/Android.mk
index 2cc0f22f7..c02378362 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,7 +1,5 @@
 LOCAL_PATH:= $(call my-dir)
 
-include $(call all-makefiles-under,$(LOCAL_PATH))
-
 include $(CLEAR_VARS)
 
 # SELinux policy version.
@@ -80,18 +78,6 @@ sepolicy_policy.conf :=
 ###################################
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := checkfc
-LOCAL_MODULE_TAGS := optional
-LOCAL_C_INCLUDES += external/libsepol/include external/libselinux/include
-LOCAL_SRC_FILES := checkfc.c
-LOCAL_STATIC_LIBRARIES := libsepol libselinux
-LOCAL_MODULE_CLASS := EXECUTABLES
-
-include $(BUILD_HOST_EXECUTABLE)
-
-##################################
-include $(CLEAR_VARS)
-
 LOCAL_MODULE := file_contexts
 LOCAL_MODULE_CLASS := ETC
 LOCAL_MODULE_TAGS := optional
@@ -175,3 +161,5 @@ include $(BUILD_PREBUILT)
 
 build_policy :=
 sepolicy_replace_paths :=
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/check_seapp/Android.mk b/check_seapp/Android.mk
deleted file mode 100644
index e4a4acc00..000000000
--- a/check_seapp/Android.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-##
-# checkseapp
-#
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := checkseapp
-LOCAL_MODULE_TAGS := optional
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../libsepol/include/ 
-LOCAL_CFLAGS := -DLINK_SEPOL_STATIC 
-LOCAL_SRC_FILES := check_seapp/check_seapp.c
-LOCAL_STATIC_LIBRARIES := libsepol
-LOCAL_MODULE_CLASS := EXECUTABLES
-
-include $(BUILD_HOST_EXECUTABLE)
diff --git a/tools/Android.mk b/tools/Android.mk
new file mode 100644
index 000000000..8d61e25fd
--- /dev/null
+++ b/tools/Android.mk
@@ -0,0 +1,24 @@
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := checkseapp
+LOCAL_MODULE_TAGS := optional
+LOCAL_C_INCLUDES := external/libsepol/include/
+LOCAL_CFLAGS := -DLINK_SEPOL_STATIC
+LOCAL_SRC_FILES := check_seapp.c
+LOCAL_STATIC_LIBRARIES := libsepol
+
+include $(BUILD_HOST_EXECUTABLE)
+
+###################################
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := checkfc
+LOCAL_MODULE_TAGS := optional
+LOCAL_C_INCLUDES := external/libsepol/include \
+                    external/libselinux/include
+LOCAL_SRC_FILES := checkfc.c
+LOCAL_STATIC_LIBRARIES := libsepol libselinux
+
+include $(BUILD_HOST_EXECUTABLE)
diff --git a/check_seapp/check_seapp.c b/tools/check_seapp.c
similarity index 100%
rename from check_seapp/check_seapp.c
rename to tools/check_seapp.c
diff --git a/checkfc.c b/tools/checkfc.c
similarity index 100%
rename from checkfc.c
rename to tools/checkfc.c
-- 
GitLab