Use libcap on Android.
Bug: 23787966
Change-Id: I8a7362e6551d55b473a7382665dc3e895bff9d56
diff --git a/Android.mk b/Android.mk
index bffb1fe..b20a3a4 100644
--- a/Android.mk
+++ b/Android.mk
@@ -20,7 +20,7 @@
# ========================================================
minijailCommonCFlags := -Wall -Werror -Wno-unused-function -Wno-unused-parameter
-minijailCommonSharedLibraries := libcap-ng
+minijailCommonSharedLibraries := libcap
# libminijail shared library for target
# ========================================================
diff --git a/libminijail.c b/libminijail.c
index 26186e3..78db271 100644
--- a/libminijail.c
+++ b/libminijail.c
@@ -683,13 +683,6 @@
void drop_caps(const struct minijail *j)
{
-#if defined(__ANDROID__)
- /*
- * Temporarily disable capabilities support until Minijail can use
- * libcap-ng.
- */
- (void) j;
-#else
cap_t caps = cap_get_proc();
cap_value_t flag[1];
const uint64_t one = 1;
@@ -745,7 +738,6 @@
die("can't apply final cleaned capset");
cap_free(caps);
-#endif
}
void set_seccomp_filter(const struct minijail *j)
