Snap for 4396096 from b48d5ddc7b24b693f92d1d10275151544a22578e to pi-releaseandroid-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-security-9.0.0_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-p-preview-5android-p-preview-4android-p-preview-1android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-platform-releasepie-gsipie-cuttlefish-testingpie-cts-releasepie-arcp-preview-1

Change-Id: Iad99ea07a7dbf331cb97d661544e45114cec8c62

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)