Checkpolicy: Migrate to soong

Remove checkmodule target. It's not used anywhere.

Bug: 37512442
Test: build and boot Marlin.
Test: "dispol policy", then display unconditional avtab
Test: run "bpfmt -w Android.bp" verify no changes made.
Change-Id: Ifa29b600bd90cc16c612eb05e1e2ba9f6faed3e6
This commit is contained in:
Jeff Vander Stoep 2017-05-08 22:22:17 -07:00 committed by Jeffrey Vander Stoep
parent a762060607
commit c158e00746
4 changed files with 28 additions and 59 deletions

View file

@ -1,4 +1,5 @@
subdirs = [
"checkpolicy",
"libselinux",
"libsepol",
]

View file

@ -1 +1 @@
include $(call all-named-subdir-makefiles, checkpolicy secilc libselinux)
include $(call all-named-subdir-makefiles, secilc libselinux)

26
checkpolicy/Android.bp Normal file
View file

@ -0,0 +1,26 @@
common_CFLAGS = [
"-Wall",
"-Werror",
"-Wshadow",
]
cc_binary_host {
name: "checkpolicy",
cflags: common_CFLAGS,
srcs: [
"policy_parse.y",
"policy_scan.l",
"queue.c",
"module_compiler.c",
"parse_util.c",
"policy_define.c",
"checkpolicy.c",
],
static_libs: ["libsepol"],
}
cc_binary_host {
name: "dispol",
srcs: ["test/dispol.c"],
static_libs: ["libsepol"],
}

View file

@ -1,58 +0,0 @@
LOCAL_PATH:= $(call my-dir)
common_src_files := \
policy_parse.y \
policy_scan.l \
queue.c \
module_compiler.c \
parse_util.c \
policy_define.c
common_cflags := \
-Wall -Wshadow -O2 \
-pipe -fno-strict-aliasing \
##
# checkpolicy
#
include $(CLEAR_VARS)
LOCAL_MODULE := checkpolicy
LOCAL_MODULE_TAGS := optional
LOCAL_CFLAGS := $(common_cflags)
LOCAL_SRC_FILES := $(common_src_files) checkpolicy.c
LOCAL_STATIC_LIBRARIES := libsepol
LOCAL_YACCFLAGS := -v
LOCAL_MODULE_CLASS := EXECUTABLES
include $(BUILD_HOST_EXECUTABLE)
##
# checkmodule
#
include $(CLEAR_VARS)
LOCAL_MODULE := checkmodule
LOCAL_MODULE_TAGS := optional
LOCAL_CFLAGS := $(common_cflags)
LOCAL_SRC_FILES := $(common_src_files) checkmodule.c
LOCAL_STATIC_LIBRARIES := libsepol
LOCAL_YACCFLAGS := -v
LOCAL_MODULE_CLASS := EXECUTABLES
include $(BUILD_HOST_EXECUTABLE)
##
# dispol
#
include $(CLEAR_VARS)
LOCAL_MODULE := dispol
LOCAL_MODULE_TAGS := optional
LOCAL_CFLAGS := $(common_cflags)
LOCAL_SRC_FILES := test/dispol.c
LOCAL_STATIC_LIBRARIES := libsepol
LOCAL_MODULE_CLASS := EXECUTABLES
include $(BUILD_HOST_EXECUTABLE)