2 files changed, 30 insertions, 24 deletions
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..62740c7
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,30 @@
+// Copyright 2017 The Android Open Source Project
+
+cc_library_static {
+    name: "libfec_rs",
+    host_supported: true,
+    srcs: [
+        "encode_rs_char.c",
+        "decode_rs_char.c",
+        "init_rs_char.c",
+    ],
+    cflags: ["-Wall", "-O3"],
+    export_include_dirs: ["."],
+
+    clang: true,
+    target: {
+        linux: {
+            sanitize: {
+                misc_undefined: ["integer"],
+            },
+        },
+        android: {
+            sanitize: {
+                misc_undefined: ["integer"],
+            },
+        },
+        windows: {
+            enabled: true,
+        },
+    },
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 9b2d6da..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-common_src_files := \
-	encode_rs_char.c \
-	decode_rs_char.c \
-	init_rs_char.c
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libfec_rs
-LOCAL_CLANG := true
-LOCAL_CFLAGS := -Wall -O3
-LOCAL_SANITIZE := integer
-LOCAL_SRC_FILES := $(common_src_files)
-include $(BUILD_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libfec_rs
-LOCAL_CLANG := true
-LOCAL_CFLAGS := -Wall -O3
-ifeq ($(HOST_OS),linux)
-LOCAL_SANITIZE := integer
-endif
-LOCAL_SRC_FILES := $(common_src_files)
-include $(BUILD_HOST_STATIC_LIBRARY)