diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-02-24 12:05:31 -0800 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2012-02-24 12:05:31 -0800 |
| commit | 1ae8d4eaa3d52e0b61728c7fc709d28e85c7ce21 (patch) | |
| tree | aaa1eb7472e817dddb581e67b9c5f538f880ac01 /toolbox/Android.mk | |
| parent | 6439693effbec06c6effcbd9b5acd405ccbeccb3 (diff) | |
| parent | 448980724da9ec43917e403d482db398e41e44d0 (diff) | |
| download | system_core-1ae8d4eaa3d52e0b61728c7fc709d28e85c7ce21.tar.gz system_core-1ae8d4eaa3d52e0b61728c7fc709d28e85c7ce21.tar.bz2 system_core-1ae8d4eaa3d52e0b61728c7fc709d28e85c7ce21.zip | |
resolved conflicts for merge of 44898072 to master
Change-Id: Ib77a4d9161261306253a174727801526e7149621
Diffstat (limited to 'toolbox/Android.mk')
| -rw-r--r-- | toolbox/Android.mk | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/toolbox/Android.mk b/toolbox/Android.mk index 7e20448b..be95e7cd 100644 --- a/toolbox/Android.mk +++ b/toolbox/Android.mk @@ -58,6 +58,21 @@ TOOLS := \ lsof \ md5 +ifeq ($(HAVE_SELINUX),true) + +TOOLS += \ + getenforce \ + setenforce \ + chcon \ + restorecon \ + runcon \ + getsebool \ + setsebool \ + load_policy + +endif + + ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT))) TOOLS += r endif @@ -71,6 +86,14 @@ LOCAL_SHARED_LIBRARIES := libcutils libc libusbhost LOCAL_C_INCLUDES := bionic/libc/bionic +ifeq ($(HAVE_SELINUX),true) + +LOCAL_CFLAGS += -DHAVE_SELINUX +LOCAL_SHARED_LIBRARIES += libselinux +LOCAL_C_INCLUDES += external/libselinux/include + +endif + LOCAL_MODULE:= toolbox # Including this will define $(intermediates). |