From 5b6ed49707290c2e64b91e3c5d8682c9e57826ff Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Mon, 19 Nov 2018 17:33:03 -0800 Subject: Convert libdaemon to Android.bp See build/soong/README.md for more information. Test: cd external/libdaemon; mma Change-Id: Ibcb8be77eee070e43ec6c4829d2dedf0080bf091 --- Android.bp | 23 +++++++++++++++++++++++ Android.mk | 1 - libdaemon/Android.mk | 34 ---------------------------------- 3 files changed, 23 insertions(+), 35 deletions(-) create mode 100644 Android.bp delete mode 100644 Android.mk delete mode 100644 libdaemon/Android.mk 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) -- cgit v1.2.3