diff options
| author | Steve Muckle <smuckle@google.com> | 2017-10-10 14:50:34 -0700 |
|---|---|---|
| committer | Steve Muckle <smuckle@google.com> | 2017-10-12 11:54:09 -0700 |
| commit | ed169c98864874ed5ee9bb1d39e621d07ebfc92d (patch) | |
| tree | 1b48c9b714d53c677468690edcdaa5939faab4d9 | |
| parent | c5a85815e28c7b29d19d532a5548e7ce63a87920 (diff) | |
| download | libcap-ng-ed169c98864874ed5ee9bb1d39e621d07ebfc92d.tar.gz | |
convert to Soong, static library
The capabilities kselftest depends on this library. Rather than have VTS
copy the library separately, just compile it statically, as nothing else
currently uses it. Nothing uses pscap so that is removed.
Bug: 34378093
Change-Id: I6afab1d23c50819245f1c1f0431c28ebc50c4903
| -rw-r--r-- | Android.bp | 16 | ||||
| -rw-r--r-- | Android.mk | 25 |
2 files changed, 16 insertions, 25 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..65d50aa --- /dev/null +++ b/Android.bp @@ -0,0 +1,16 @@ +cc_library_static { + + srcs: [ + "libcap-ng-0.7/src/cap-ng.c", + "libcap-ng-0.7/src/lookup_table.c", + ], + + export_include_dirs: ["libcap-ng-0.7/src"], + name: "libcap-ng", + cflags: [ + "-Wall", + "-Werror", + "-Wno-enum-conversion", + "-Wno-unused-parameter", + ], +} diff --git a/Android.mk b/Android.mk deleted file mode 100644 index 0c298b6..0000000 --- a/Android.mk +++ /dev/null @@ -1,25 +0,0 @@ -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - libcap-ng-0.7/src/cap-ng.c \ - libcap-ng-0.7/src/lookup_table.c - -LOCAL_C_INCLUDES += $(LOCAL_PATH)/libcap-ng-0.7/src -LOCAL_MODULE := libcap-ng -LOCAL_CFLAGS := \ - -Wall -Werror \ - -Wno-enum-conversion \ - -Wno-unused-parameter -include $(BUILD_SHARED_LIBRARY) - -###################### - -include $(CLEAR_VARS) -LOCAL_SRC_FILES := libcap-ng-0.7/utils/pscap.c -LOCAL_C_INCLUDES += $(LOCAL_PATH)/libcap-ng-0.7/src -LOCAL_SHARED_LIBRARIES += libcap-ng -LOCAL_MODULE := pscap -LOCAL_CFLAGS := -Wall -Werror -include $(BUILD_EXECUTABLE) |