diff options
| author | Elliott Hughes <enh@google.com> | 2016-05-13 21:57:23 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-13 21:57:23 +0000 |
| commit | df64c96f01b3dd2a823d6aa788653c3bedd1efda (patch) | |
| tree | 0fa8d9e7874bedc3d5b0240c332afb1e34ec766f | |
| parent | ca69393b8f54e0cd38d876547a0d82e641951798 (diff) | |
| parent | b74b4ad38fa162d3fe09e035fa570f419261c7dd (diff) | |
| download | dhcpcd-6.8.2-df64c96f01b3dd2a823d6aa788653c3bedd1efda.tar.gz | |
resolve merge conflicts of 1cff673 to nyc-dev-plus-aospandroid-wear-o-preview-4android-wear-o-preview-3android-o-preview-4android-o-preview-3android-o-preview-2android-o-preview-1android-o-iot-preview-5android-n-mr2-preview-2android-n-mr2-preview-1android-n-iot-preview-4o-previewo-iot-preview-5n-iot-preview-4
am: b74b4ad38f
* commit 'b74b4ad38fa162d3fe09e035fa570f419261c7dd':
Make dhcpcd-6.8.2 admit that it uses BSD extensions.
Change-Id: Idc1accf23b67aadda5894f902f6c06d59ae2ed01
| -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 |