Revert "Compile capabilities sefltests." am: f8adf2c570
am: 131c963bd9
Change-Id: I9f2f110d7fbcc0e63f2e5bc142c23ed004cf1e95
diff --git a/android/Android.kselftest.mk b/android/Android.kselftest.mk
index 4bd87c4..3abacdbe 100644
--- a/android/Android.kselftest.mk
+++ b/android/Android.kselftest.mk
@@ -29,21 +29,6 @@
module_supported_arch := x86 x86_64
include $(build_kselftest_test)
-# Capabilities test
-module_testname := capabilities/test_execve
-module_src_files := capabilities/test_execve.c
-module_cflags :=
-module_c_includes :=
-module_supported_arch := arm arm64
-include $(build_kselftest_test)
-
-module_testname := capabilities/validate_cap
-module_src_files := capabilities/validate_cap.c
-module_cflags :=
-module_c_includes :=
-module_supported_arch := arm arm64
-include $(build_kselftest_test)
-
# Cpu-hotplug test
module_prebuilt := cpu-hotplug/cpu-on-off-test
module_src_files := cpu-hotplug/cpu-on-off-test.sh
diff --git a/android/Android.test.mk b/android/Android.test.mk
index c460869..d727751 100644
--- a/android/Android.test.mk
+++ b/android/Android.test.mk
@@ -33,12 +33,7 @@
LOCAL_CFLAGS := $(kselftest_cflags) $(module_cflags)
LOCAL_C_INCLUDES := $(kselftest_c_includes) \
- $(addprefix $(kselftest_root)/$(kselftest_dir)/,$(module_c_includes)) \
- external/libcap-ng/libcap-ng-0.7/src \
-
-LOCAL_SHARED_LIBRARIES := \
- libcap-ng \
-
+ $(addprefix $(kselftest_root)/$(kselftest_dir)/,$(module_c_includes))
LOCAL_SRC_FILES := $(addprefix $(kselftest_dir)/,$(module_src_files))
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.test.mk
