diff options
| author | Steve Muckle <smuckle@google.com> | 2017-10-15 02:17:41 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-10-15 02:17:41 +0000 |
| commit | 9268914ae163fbb60c63ab16aba6906c9c92e35c (patch) | |
| tree | 1b48c9b714d53c677468690edcdaa5939faab4d9 | |
| parent | 95977907ccc9f31a62a5f7fbb80abdb8a5d6ce94 (diff) | |
| parent | e1c4f45c70a22609b2254f17e928bc5e1ab80582 (diff) | |
| download | libcap-ng-9268914ae163fbb60c63ab16aba6906c9c92e35c.tar.gz | |
Merge "convert to Soong, static library" am: 168a87ba95 am: 7ee71735dfandroid-wear-p-preview-2
am: e1c4f45c70
Change-Id: I49687b52e314ff90d5d5d5a3f48c6c761bd96fde
| -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) |