diff options
| author | Elliott Hughes <enh@google.com> | 2016-05-13 14:50:59 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2016-05-13 14:50:59 -0700 |
| commit | b74b4ad38fa162d3fe09e035fa570f419261c7dd (patch) | |
| tree | 0fa8d9e7874bedc3d5b0240c332afb1e34ec766f | |
| parent | ca69393b8f54e0cd38d876547a0d82e641951798 (diff) | |
| parent | 1cff6731f916e07dc13ab4765d480c87ee590cd7 (diff) | |
| download | dhcpcd-6.8.2-b74b4ad38fa162d3fe09e035fa570f419261c7dd.tar.gz | |
resolve merge conflicts of 1cff673 to nyc-dev-plus-aospandroid-n-mr1-preview-2android-n-mr1-preview-1
Change-Id: I38e31b1e1eee0a456ebd602029198bb7907e1239
| -rw-r--r-- | Android.mk | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -52,6 +52,8 @@ else LOCAL_SRC_FILES += script-stub.c endif +LOCAL_CFLAGS += -D_BSD_SOURCE + ifeq ($(DHCPCD_USE_IPV6), yes) LOCAL_SRC_FILES += ipv6.c ipv6nd.c dhcp6.c LOCAL_SRC_FILES += crypt/sha256.c |