Skip to contentSkip to conversation

Add empty top level Android.mk / CleanSpec.mk files

PATCH In review Nick Kralevich 3 participants 4 messages Apr 15, 2015 – Apr 16, 2015 SELinux security module

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Add empty top level Android.mk / CleanSpec.mk files

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
Android.mk new file +2 -0
new file mode 100644
index 0000000..02f35a9
@@ -0,0 +1,2 @@
+# This empty Android.mk file will prevent the build system
+# from building anything below this point.
CleanSpec.mk new file +2 -0
new file mode 100644
index 0000000..1ac5a62
@@ -0,0 +1,2 @@
+# This empty CleanSpec.mk file will prevent the build system
+# from descending into subdirs.
Signature · 1 line
2.2.0.rc0.207.ga3a616c
Acked-by on v1 1/1
#1 lore raw
Quoted 36 lines · 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
Android.mk new file +2 -0
new file mode 100644
index 0000000..02f35a9
@@ -0,0 +1,2 @@
+# This empty Android.mk file will prevent the build system
+# from building anything below this point.
CleanSpec.mk new file +2 -1
new file mode 100644
index 0000000..1ac5a62
@@ -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
[email protected]
To unsubscribe, send email to [email protected].
To get help, send an email containing "help" to [email protected].

#2 lore raw
In reply to Nick Kralevich
Quoted 5 lines · 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

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.

Quoted 24 lines
---
 Android.mk   | 2 ++
 CleanSpec.mk | 2 ++
 2 files changed, 4 insertions(+)
 create mode 100644 Android.mk
 create mode 100644 CleanSpec.mk
Android.mk new file +2 -0
new file mode 100644
index 0000000..02f35a9
@@ -0,0 +1,2 @@
+# This empty Android.mk file will prevent the build system
+# from building anything below this point.
CleanSpec.mk new file +2 -0
new file mode 100644
index 0000000..1ac5a62
@@ -0,0 +1,2 @@
+# This empty CleanSpec.mk file will prevent the build system
+# from descending into subdirs.
#3 lore raw
Quoted 5 lines · Stephen Smalley
Quoted 3 lines · Nick Kralevich

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

Quoted 8 lines
Quoted 2 lines

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.

Quoted 3 lines

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.

Quoted 26 lines
Quoted 25 lines
---
 Android.mk   | 2 ++
 CleanSpec.mk | 2 ++
 2 files changed, 4 insertions(+)
 create mode 100644 Android.mk
 create mode 100644 CleanSpec.mk
Android.mk new file +2 -0
new file mode 100644
index 0000000..02f35a9
@@ -0,0 +1,2 @@
+# This empty Android.mk file will prevent the build system
+# from building anything below this point.
CleanSpec.mk new file +2 -0
new file mode 100644
index 0000000..1ac5a62
@@ -0,0 +1,2 @@
+# This empty CleanSpec.mk file will prevent the build system
+# from descending into subdirs.
Signature · 1 line
Nick Kralevich | Android Security | [email protected] | 650.214.4037