Generate both static and shared libseccomp_policy.

Also switch to Android.bp

Bug: N/A
Test: builds
Change-Id: I33697a40b30d071f8d07aa33e1fb2b0c6e8a9f6d

diff --git a/libc/Android.bp b/libc/Android.bp
index 6aebb3c..1ecef1f 100644 (file)
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -2155,4 +2155,4 @@ ndk_library {
     first_version: "9",
 }
 
-subdirs = ["malloc_debug"]
+subdirs = ["*"]

diff --git a/libc/seccomp/Android.bp b/libc/seccomp/Android.bp
new file mode 100644 (file)
index 0000000..71b710e
--- /dev/null
+++ b/libc/seccomp/Android.bp
@@ -0,0 +1,15 @@
+cc_library {
+    name: "libseccomp_policy",
+    srcs: [
+        "seccomp_policy.cpp",
+        "arm_policy.cpp",
+        "arm64_policy.cpp",
+    ],
+    export_include_dirs: ["include"],
+    shared: {
+        shared_libs: ["libbase"],
+    },
+    static: {
+        static_libs: ["libbase"],
+    },
+}

diff --git a/libc/seccomp/Android.mk b/libc/seccomp/Android.mk
deleted file mode 100644 (file)
index fa02698..0000000
--- a/libc/seccomp/Android.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-LOCAL_MODULE := libseccomp_policy
-LOCAL_CLANG := true
-LOCAL_SRC_FILES := seccomp_policy.cpp arm_policy.cpp arm64_policy.cpp
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
-LOCAL_SHARED_LIBRARIES := libbase
-
-include $(BUILD_STATIC_LIBRARY)
-

diff --git a/libc/seccomp/seccomp_policy.h b/libc/seccomp/include/seccomp_policy.h
similarity index 100%
rename from libc/seccomp/seccomp_policy.h
rename to libc/seccomp/include/seccomp_policy.h