From fb12c6b8aac5181ae72e939365478224ed52051e Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Wed, 29 Jan 2020 13:17:51 -0800 Subject: [PATCH] Convert sepolicy-analyze to Android.bp The LOCAL_COMPATIBILITY_SUITES variable has been removed, as the users are now embedding this binary the same way they do the rest of the sepolicy tools. Bug: 122331947 Bug: 130696912 Test: treehugger Change-Id: Ia83025b18da87204d87684f2c0af025d9cecc824 --- tools/sepolicy-analyze/Android.bp | 15 +++++++++++++++ tools/sepolicy-analyze/Android.mk | 15 --------------- 2 files changed, 15 insertions(+), 15 deletions(-) create mode 100644 tools/sepolicy-analyze/Android.bp delete mode 100644 tools/sepolicy-analyze/Android.mk diff --git a/tools/sepolicy-analyze/Android.bp b/tools/sepolicy-analyze/Android.bp new file mode 100644 index 000000000..ff40c1628 --- /dev/null +++ b/tools/sepolicy-analyze/Android.bp @@ -0,0 +1,15 @@ +cc_binary_host { + name: "sepolicy-analyze", + defaults: ["sepolicy_tools_defaults"], + + srcs: [ + "sepolicy-analyze.c", + "dups.c", + "neverallow.c", + "perm.c", + "typecmp.c", + "booleans.c", + "attribute.c", + "utils.c", + ], +} diff --git a/tools/sepolicy-analyze/Android.mk b/tools/sepolicy-analyze/Android.mk deleted file mode 100644 index 56204a5af..000000000 --- a/tools/sepolicy-analyze/Android.mk +++ /dev/null @@ -1,15 +0,0 @@ -LOCAL_PATH:= $(call my-dir) - -################################### -include $(CLEAR_VARS) - -LOCAL_MODULE := sepolicy-analyze -LOCAL_MODULE_TAGS := optional -LOCAL_CFLAGS := -Wall -Werror -LOCAL_SRC_FILES := sepolicy-analyze.c dups.c neverallow.c perm.c typecmp.c booleans.c attribute.c utils.c -LOCAL_STATIC_LIBRARIES := libsepol -LOCAL_CXX_STL := none - -LOCAL_COMPATIBILITY_SUITE := ats cts gts vts sts - -include $(BUILD_HOST_EXECUTABLE)