diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2018-11-16 23:03:28 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-11-16 23:03:28 -0800 |
| commit | 7a54ae2bb84a30bd1f8f9618f98b1652c4e7be21 (patch) | |
| tree | d34825d761261db57208b529cfe501404ebe34a8 | |
| parent | 556a78dc77c3edd259393028236d30cb48d9e649 (diff) | |
| parent | 1bfd896f1662c60a8881bb32b7bbc653c3fd6a88 (diff) | |
| download | platform_external_dnsmasq-7a54ae2bb84a30bd1f8f9618f98b1652c4e7be21.tar.gz platform_external_dnsmasq-7a54ae2bb84a30bd1f8f9618f98b1652c4e7be21.tar.bz2 platform_external_dnsmasq-7a54ae2bb84a30bd1f8f9618f98b1652c4e7be21.zip | |
Merge "Convert to Android.bp" am: 926a9ca483 am: 036ff47227
am: 1bfd896f16
Change-Id: I1dfc4fa629548cc7dc77b8e584e56f1382903bd0
| -rw-r--r-- | Android.mk | 1 | ||||
| -rw-r--r-- | src/Android.bp | 37 | ||||
| -rw-r--r-- | src/Android.mk | 18 |
3 files changed, 37 insertions, 19 deletions
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/src/Android.bp b/src/Android.bp new file mode 100644 index 0000000..c764039 --- /dev/null +++ b/src/Android.bp @@ -0,0 +1,37 @@ +cc_binary { + name: "dnsmasq", + srcs: [ + "cache.c", + "dhcp.c", + "dnsmasq.c", + "forward.c", + "helper.c", + "lease.c", + "log.c", + "netlink.c", + "network.c", + "option.c", + "rfc1035.c", + "rfc2131.c", + "util.c", + ], + + cflags: [ + "-O2", + "-g", + "-W", + "-Wall", + "-D__ANDROID__", + "-DIPV6", + "-DNO_SCRIPT", + "-D_BSD_SOURCE", + "-Wno-unused-variable", + "-Wno-unused-parameter", + "-Werror", + ], + system_shared_libs: ["libc"], + shared_libs: [ + "libcutils", + "liblog", + ], +} diff --git a/src/Android.mk b/src/Android.mk deleted file mode 100644 index 0ec872a..0000000 --- a/src/Android.mk +++ /dev/null @@ -1,18 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -######################### - -include $(CLEAR_VARS) -LOCAL_SRC_FILES := cache.c dhcp.c dnsmasq.c forward.c helper.c lease.c log.c \ - netlink.c network.c option.c rfc1035.c rfc2131.c util.c - -LOCAL_MODULE := dnsmasq - -LOCAL_C_INCLUDES := external/dnsmasq/src - -LOCAL_CFLAGS := -O2 -g -W -Wall -D__ANDROID__ -DIPV6 -DNO_SCRIPT -D_BSD_SOURCE \ - -Wno-unused-variable -Wno-unused-parameter -Werror -LOCAL_SYSTEM_SHARED_LIBRARIES := libc -LOCAL_SHARED_LIBRARIES := libcutils liblog - -include $(BUILD_EXECUTABLE) |