DO NOT MERGE
Merge pie-platform-release (PPRL.181205.001, history only) into master
Bug: 120502534
Change-Id: I1a4066bf7c9d68667a94b90ee173f3880fb74b33
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..452fd2a
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,23 @@
+cc_library_shared {
+ name: "libdaemon",
+
+ srcs: [
+ "libdaemon/dexec.c",
+ "libdaemon/dfork.c",
+ "libdaemon/dlog.c",
+ "libdaemon/dnonblock.c",
+ "libdaemon/dpid.c",
+ "libdaemon/dsignal.c",
+ ],
+
+ export_include_dirs: ["."],
+
+ cflags: [
+ "-Wall",
+ "-Werror",
+ "-Wno-error=user-defined-warnings",
+ "-Wno-unused-parameter",
+ "-DHAVE_CONFIG_H",
+ "-DLOCALSTATEDIR=\"/var\"",
+ ],
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 5053e7d..0000000
--- a/Android.mk
+++ /dev/null
@@ -1 +0,0 @@
-include $(call all-subdir-makefiles)
diff --git a/libdaemon/Android.mk b/libdaemon/Android.mk
deleted file mode 100644
index eab115b..0000000
--- a/libdaemon/Android.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES:= \
- dexec.c \
- dfork.c \
- dlog.c \
- dnonblock.c \
- dpid.c \
- dsignal.c
-
-LOCAL_C_INCLUDES+= $(LOCAL_PATH)/..
-
-LOCAL_MODULE:=libdaemon
-
-LOCAL_EXPORT_C_INCLUDE_DIRS:= $(LOCAL_PATH)/..
-
-# -std=gnu99 -DHAVE_CONFIG_H -I. -I.. -I.. -g -O2 -pipe
-# -Wall -W -Wextra -pedantic -Wformat -Wold-style-definition
-# -Wdeclaration-after-statement -Wfloat-equal -Wmissing-declarations
-# -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls
-# -Wmissing-noreturn -Wshadow -Wendif-labels -Wpointer-arith
-# -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Winline
-# -Wstrict-aliasing
-# -MT testd.o -MD -MP -MF .deps/testd.Tpo -c -o testd.o testd.c
-
-LOCAL_CFLAGS+= \
- -Wall -Werror \
- -Wno-error=user-defined-warnings \
- -Wno-unused-parameter \
- -DHAVE_CONFIG_H \
- -DLOCALSTATEDIR=\"/var\"
-
-include $(BUILD_SHARED_LIBRARY)
