diff options
| author | Tri Vo <trong@google.com> | 2017-01-26 21:39:19 +0000 |
|---|---|---|
| committer | Tri Vo <trong@google.com> | 2017-01-26 21:39:19 +0000 |
| commit | f8adf2c570fc1c9cb2f99e2ae92d6144f1aa11d2 (patch) | |
| tree | 6a9496bd11bae7e3ae6d784430503f5e16be3fbe | |
| parent | 5ae6d6bb3ec5c4afbe63d54422cb55f13e2afa26 (diff) | |
| download | linux-kselftest-o-preview.tar.gz | |
Revert "Compile capabilities sefltests."android-o-preview-1o-preview
This reverts commit 5ae6d6bb3ec5c4afbe63d54422cb55f13e2afa26.
Change-Id: I2a98a5880f996c6ad3bafda6af05c42b0a499263
| -rw-r--r-- | android/Android.kselftest.mk | 15 | ||||
| -rw-r--r-- | android/Android.test.mk | 7 |
2 files changed, 1 insertions, 21 deletions
diff --git a/android/Android.kselftest.mk b/android/Android.kselftest.mk index 4bd87c408878..3abacdbe259d 100644 --- a/android/Android.kselftest.mk +++ b/android/Android.kselftest.mk @@ -29,21 +29,6 @@ module_c_includes := 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 c460869d765b..d72775118063 100644 --- a/android/Android.test.mk +++ b/android/Android.test.mk @@ -33,12 +33,7 @@ LOCAL_MULTILIB := both 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 |