From ed169c98864874ed5ee9bb1d39e621d07ebfc92d Mon Sep 17 00:00:00 2001
From: Steve Muckle <smuckle@google.com>
Date: Tue, 10 Oct 2017 14:50:34 -0700
Subject: 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
---
 Android.bp | 16 ++++++++++++++++
 Android.mk | 25 -------------------------
 2 files changed, 16 insertions(+), 25 deletions(-)
 create mode 100644 Android.bp
 delete mode 100644 Android.mk

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)
-- 
cgit v1.2.3