On 09/27/2016 03:09 PM, William Roberts wrote: > On Tue, Sep 27, 2016 at 12:08 PM, Stephen Smalley <sds@xxxxxxxxxxxxx> wrote: >> On 09/27/2016 03:03 PM, William Roberts wrote: >>> On Tue, Sep 27, 2016 at 11:51 AM, Stephen Smalley <sds@xxxxxxxxxxxxx> wrote: >>>> On 09/27/2016 02:43 PM, William Roberts wrote: >>>>> On Sep 27, 2016 10:00, "Stephen Smalley" <sds@xxxxxxxxxxxxx >>>>> <mailto:sds@xxxxxxxxxxxxx>> wrote: >>>>>> >>>>>> On 09/27/2016 11:08 AM, William Roberts wrote: >>>>>>> On Tue, Sep 27, 2016 at 7:11 AM, Stephen Smalley <sds@xxxxxxxxxxxxx >>>>> <mailto:sds@xxxxxxxxxxxxx>> wrote: >>>>>>>> On 09/26/2016 04:53 PM, william.c.roberts@xxxxxxxxx >>>>> <mailto:william.c.roberts@xxxxxxxxx> wrote: >>>>>>>>> From: William Roberts <william.c.roberts@xxxxxxxxx >>>>> <mailto:william.c.roberts@xxxxxxxxx>> >>>>>>>>> >>>>>>>>> To build the selinux host configuration, specify >>>>>>>>> ANDROID_HOST=y on the Make command line. >>>>>>>>> >>>>>>>>> eg) >>>>>>>>> make ANDROID_HOST=y >>>>>>>> >>>>>>>> Seems oddly named, neither corresponding to the #define it enables >>>>>>>> (BUILD_HOST) nor to the target platform. >>>>>>> >>>>>>> We could change this to BUILD_HOST=y to enable all of it, but >>>>> considering >>>>>>> that this build is specific for Android, I thought the naming to be more >>>>>>> appropriate. >>>>>>> >>>>>>> Additionally, EMBEDDED doesn't flip anything called EMBEDDED as well. >>>>>>> >>>>>>>> >>>>>>>>> >>>>>>>>> Signed-off-by: William Roberts <william.c.roberts@xxxxxxxxx >>>>> <mailto:william.c.roberts@xxxxxxxxx>> >>>>>>>>> --- >>>>>>>>> libselinux/Makefile | 8 +++++++- >>>>>>>>> libselinux/src/Makefile | 50 >>>>> +++++++++++++++++++++++++++++++++---------------- >>>>>>>>> 2 files changed, 41 insertions(+), 17 deletions(-) >>>>>>>>> >>>>>>>>> diff --git a/libselinux/Makefile b/libselinux/Makefile >>>>>>>>> index 5a8d42c..50ae009 100644 >>>>>>>>> --- a/libselinux/Makefile >>>>>>>>> +++ b/libselinux/Makefile >>>>>>>>> @@ -10,6 +10,12 @@ ifeq ($(EMBEDDED),y) >>>>>>>>> override DISABLE_RPM=y >>>>>>>>> override DISABLE_BOOL=y >>>>>>>>> endif >>>>>>>>> +ifeq ($(ANDROID_HOST),y) >>>>>>>>> + override DISABLE_SETRANS=y >>>>>>>>> + EMFLAGS+= -DDISABLE_RPM -DNO_MEDIA_BACKEND -DNO_DB_BACKEND >>>>> -DNO_X_BACKEND \ >>>>>>>>> + -DBUILD_HOST >>>>>>>>> + SUBDIRS = src >>>>>>>>> +endif >>>>>> >>>>>> Also, this is redundant; you can handle it entirely within >>>>>> libselinux/src/Makefile without anything here. >>>>> >>>>> You mean all the ANDROID _HOST stuff? I didn't want to depart from >>>>> what's there, that seemed to be the spot for disabling things. >>>> >>>> You don't use the -DNO_*_BACKEND or -DBUILD_HOST flags anywhere except >>>> in src/Makefile, so you don't need to set them here. >>>> >>> >>> The same could be said about DISABLE_SETRANS >> >> It isn't set in both Makefiles. Pick one. > > Its not set in both, did you mean referenced/used? In fact I don't > even set the default n, which I should be doing. You set -DNO_*_BACKEND and -DBUILD_HOST in both Makefiles if ANDROID_HOST=y. _______________________________________________ Selinux mailing list Selinux@xxxxxxxxxxxxx To unsubscribe, send email to Selinux-leave@xxxxxxxxxxxxx. To get help, send an email containing "help" to Selinux-request@xxxxxxxxxxxxx.
