[PATCH] Add empty top level Android.mk / CleanSpec.mk files

[PATCH] Add empty top level Android.mk / CleanSpec.mk files

[Nick Kralevich]

Needed to allow Android to keep building with a copy of the SELinux
source code checked into external/selinux

Bug: 19963152
Change-Id: I4e192bb6ca5d185e11540aca7253e729d92a00c1
---
 Android.mk   | 2 ++
 CleanSpec.mk | 2 ++
 2 files changed, 4 insertions(+)
 create mode 100644 Android.mk
 create mode 100644 CleanSpec.mk

diff --git a/Android.mk b/Android.mk
new file mode 100644
index 0000000..02f35a9
--- /dev/null
+++ b/Android.mk
@@ -0,0 +1,2 @@
+# This empty Android.mk file will prevent the build system
+# from building anything below this point.
diff --git a/CleanSpec.mk b/CleanSpec.mk
new file mode 100644
index 0000000..1ac5a62
--- /dev/null
+++ b/CleanSpec.mk
@@ -0,0 +1,2 @@
+# This empty CleanSpec.mk file will prevent the build system
+# from descending into subdirs.
-- 
2.2.0.rc0.207.ga3a616c

Re: [PATCH] Add empty top level Android.mk / CleanSpec.mk files

[Jeffrey Vander Stoep]

Acked-by:  Jeff Vander Stoep <jeffv@google.com>

On Wed, Apr 15, 2015 at 3:07 PM, Nick Kralevich <nnk@google.com> wrote:
> Needed to allow Android to keep building with a copy of the SELinux
> source code checked into external/selinux
>
> Bug: 19963152
> Change-Id: I4e192bb6ca5d185e11540aca7253e729d92a00c1
> ---
>  Android.mk   | 2 ++
>  CleanSpec.mk | 2 ++
>  2 files changed, 4 insertions(+)
>  create mode 100644 Android.mk
>  create mode 100644 CleanSpec.mk
>
> diff --git a/Android.mk b/Android.mk
> new file mode 100644
> index 0000000..02f35a9
> --- /dev/null
> +++ b/Android.mk
> @@ -0,0 +1,2 @@
> +# This empty Android.mk file will prevent the build system
> +# from building anything below this point.
> diff --git a/CleanSpec.mk b/CleanSpec.mk
> new file mode 100644
> index 0000000..1ac5a62
> --- /dev/null
> +++ b/CleanSpec.mk
> @@ -0,0 +1,2 @@
> +# This empty CleanSpec.mk file will prevent the build system
> +# from descending into subdirs.
> --
> 2.2.0.rc0.207.ga3a616c
>
> _______________________________________________
> Selinux mailing list
> Selinux@tycho.nsa.gov
> To unsubscribe, send email to Selinux-leave@tycho.nsa.gov.
> To get help, send an email containing "help" to Selinux-request@tycho.nsa.gov.

Re: [PATCH] Add empty top level Android.mk / CleanSpec.mk files

[Stephen Smalley]

On 04/15/2015 06:07 PM, Nick Kralevich wrote:
> Needed to allow Android to keep building with a copy of the SELinux
> source code checked into external/selinux
> 
> Bug: 19963152
> Change-Id: I4e192bb6ca5d185e11540aca7253e729d92a00c1

Thanks, applied.  I assume at some point you'll switch over to using the
external/selinux/{libsepol,checkpolicy,secilc} and drop
external/{libsepol,checkpolicy}, but retain external/libselinux since it
is a fork and differs substantially as described in its README.android
file.  I suppose someone could try to upstream all the changes, some
under conditional guards for ANDROID, but it wouldn't be trivial; I took
a hacksaw to libselinux originally for Android.

> ---
>  Android.mk   | 2 ++
>  CleanSpec.mk | 2 ++
>  2 files changed, 4 insertions(+)
>  create mode 100644 Android.mk
>  create mode 100644 CleanSpec.mk
> 
> diff --git a/Android.mk b/Android.mk
> new file mode 100644
> index 0000000..02f35a9
> --- /dev/null
> +++ b/Android.mk
> @@ -0,0 +1,2 @@
> +# This empty Android.mk file will prevent the build system
> +# from building anything below this point.
> diff --git a/CleanSpec.mk b/CleanSpec.mk
> new file mode 100644
> index 0000000..1ac5a62
> --- /dev/null
> +++ b/CleanSpec.mk
> @@ -0,0 +1,2 @@
> +# This empty CleanSpec.mk file will prevent the build system
> +# from descending into subdirs.
> 

Re: [PATCH] Add empty top level Android.mk / CleanSpec.mk files

[Nick Kralevich]

On Thu, Apr 16, 2015 at 4:58 AM, Stephen Smalley <sds@tycho.nsa.gov> wrote:
>
> On 04/15/2015 06:07 PM, Nick Kralevich wrote:
> > Needed to allow Android to keep building with a copy of the SELinux
> > source code checked into external/selinux
> >
> > Bug: 19963152
> > Change-Id: I4e192bb6ca5d185e11540aca7253e729d92a00c1
>
> Thanks, applied.  I assume at some point you'll switch over to using the
> external/selinux/{libsepol,checkpolicy,secilc} and drop
> external/{libsepol,checkpolicy}, but retain external/libselinux since it
> is a fork and differs substantially as described in its README.android
> file.

Yes that's my hope. Plus there's other utilities I want there, such as
audit2allow, where I don't want to rely on what's installed on the
host.

> I suppose someone could try to upstream all the changes, some
> under conditional guards for ANDROID, but it wouldn't be trivial; I took
> a hacksaw to libselinux originally for Android.

I haven't looked yet to see how far apart the two sets of code are.
Ideally we could merge them but as you point out, it's not trivial.

>
> > ---
> >  Android.mk   | 2 ++
> >  CleanSpec.mk | 2 ++
> >  2 files changed, 4 insertions(+)
> >  create mode 100644 Android.mk
> >  create mode 100644 CleanSpec.mk
> >
> > diff --git a/Android.mk b/Android.mk
> > new file mode 100644
> > index 0000000..02f35a9
> > --- /dev/null
> > +++ b/Android.mk
> > @@ -0,0 +1,2 @@
> > +# This empty Android.mk file will prevent the build system
> > +# from building anything below this point.
> > diff --git a/CleanSpec.mk b/CleanSpec.mk
> > new file mode 100644
> > index 0000000..1ac5a62
> > --- /dev/null
> > +++ b/CleanSpec.mk
> > @@ -0,0 +1,2 @@
> > +# This empty CleanSpec.mk file will prevent the build system
> > +# from descending into subdirs.
> >
>



-- 
Nick Kralevich | Android Security | nnk@google.com | 650.214.4037