Convert to Android.bp am: 4810da91a8 am: 6e7165dc37

am: f909992a6a

Change-Id: Ia3d7f1719e3af2600cbb3be37be24c77422bf062

2 files changed, 33 insertions, 38 deletions

diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..cddf41e
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,33 @@
+// Copyright 2016 The Android Open Source Project
+
+cc_defaults {
+    name: "apf_defaults",
+
+    cflags: [
+        "-DAPF_FRAME_HEADER_SIZE=14",
+        "-Wall",
+        "-Werror",
+    ],
+}
+
+cc_library_static {
+    name: "libapf",
+    defaults: ["apf_defaults"],
+    srcs: ["apf_interpreter.c"],
+
+}
+
+cc_binary_host {
+    name: "apf_disassembler",
+    defaults: ["apf_defaults"],
+    srcs: ["apf_disassembler.c"],
+}
+
+cc_binary_host {
+    name: "apf_run",
+    defaults: ["apf_defaults"],
+    srcs: [
+        "apf_run.c",
+        "apf_interpreter.c",
+    ],
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index ca3bc69..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2016 The Android Open Source Project
-
-LOCAL_PATH:= $(call my-dir)
-
-APF_CFLAGS := -DAPF_FRAME_HEADER_SIZE=14 \
-    -Wall \
-    -Werror
-
-include $(CLEAR_VARS)
-
-LOCAL_INCLUDES += $(LOCAL_PATH)
-
-LOCAL_CFLAGS += $(APF_CFLAGS)
-
-LOCAL_SRC_FILES += apf_interpreter.c
-
-LOCAL_MODULE:= libapf
-
-include $(BUILD_STATIC_LIBRARY)
-
-
-include $(CLEAR_VARS)
-
-LOCAL_CFLAGS += $(APF_CFLAGS)
-LOCAL_SRC_FILES += apf_disassembler.c
-LOCAL_MODULE := apf_disassembler
-LOCAL_MODULE_TAGS := debug
-
-include $(BUILD_HOST_EXECUTABLE)
-
-include $(CLEAR_VARS)
-
-LOCAL_CFLAGS += $(APF_CFLAGS)
-LOCAL_SRC_FILES += apf_run.c apf_interpreter.c
-LOCAL_MODULE := apf_run
-LOCAL_MODULE_TAGS := debug
-
-include $(BUILD_HOST_EXECUTABLE)