From 7d66ce57b61ee8b943ebca245b3beca2d7d09575 Mon Sep 17 00:00:00 2001 From: Andrea Mennillo Date: Tue, 17 Mar 2015 15:39:27 +0100 Subject: toolbox: Include setenforce into tools.h setenforce was filtered out of toolbox tools too early. Only filter it out just before symlinking (and only if busybox provides it). Change-Id: Id8c77d12b440416bfc21bf52705f2387ffd897cf --- toolbox/Android.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/toolbox/Android.mk b/toolbox/Android.mk index 9e7bbc4e6..e58b755e5 100644 --- a/toolbox/Android.mk +++ b/toolbox/Android.mk @@ -188,6 +188,13 @@ else ALL_TOOLS := $(OUR_TOOLS) endif +TOOLS_H := $(intermediates)/tools.h +$(TOOLS_H): PRIVATE_TOOLS := $(ALL_TOOLS) +$(TOOLS_H): PRIVATE_CUSTOM_TOOL = echo "/* file generated automatically */" > $@ ; for t in $(PRIVATE_TOOLS) ; do echo "TOOL($$t)" >> $@ ; done +$(TOOLS_H): $(LOCAL_PATH)/Android.mk +$(TOOLS_H): + $(transform-generated-source) + ifeq ($(TWHAVE_SELINUX), true) # toolbox setenforce is used during init in non-symlink form, so it was # required to be included as part of the suite above. if busybox already @@ -196,13 +203,6 @@ ifeq ($(TWHAVE_SELINUX), true) ALL_TOOLS := $(TEMP_TOOLS) endif -TOOLS_H := $(intermediates)/tools.h -$(TOOLS_H): PRIVATE_TOOLS := $(ALL_TOOLS) -$(TOOLS_H): PRIVATE_CUSTOM_TOOL = echo "/* file generated automatically */" > $@ ; for t in $(PRIVATE_TOOLS) ; do echo "TOOL($$t)" >> $@ ; done -$(TOOLS_H): $(LOCAL_PATH)/Android.mk -$(TOOLS_H): - $(transform-generated-source) - # Make /sbin/toolbox launchers for each tool SYMLINKS := $(addprefix $(TARGET_RECOVERY_ROOT_OUT)/sbin/,$(ALL_TOOLS)) $(SYMLINKS): TOOLBOX_BINARY := $(LOCAL_MODULE_STEM) -- cgit v1.2.3