commit b74b4ad38fa162d3fe09e035fa570f419261c7dd
author Elliott Hughes <enh@google.com> Fri May 13 14:50:59 2016 -0700
committer Elliott Hughes <enh@google.com> Fri May 13 14:50:59 2016 -0700
tree 0fa8d9e7874bedc3d5b0240c332afb1e34ec766f
parent ca69393b8f54e0cd38d876547a0d82e641951798
parent 1cff6731f916e07dc13ab4765d480c87ee590cd7

resolve merge conflicts of 1cff673 to nyc-dev-plus-aosp

Change-Id: I38e31b1e1eee0a456ebd602029198bb7907e1239

Android.mk

diff --git a/Android.mk b/Android.mk
index 2a41dd5..36ab085 100644
--- a/Android.mk
+++ b/Android.mk
@@ -35,7 +35,6 @@
     dhcp.c \
     ipv4.c \
     ipv4ll.c \
-    script-stub.c \
     ifaddrs.c \
     crypt/md5.c \
     crypt/hmac_md5.c \
@@ -47,6 +46,12 @@
 # Always support IPv4.
 LOCAL_CFLAGS += -DINET
 
+ifeq ($(DHCPCD_USE_SCRIPT), yes)
+LOCAL_SRC_FILES += script.c
+else
+LOCAL_SRC_FILES += script-stub.c
+endif
+
 LOCAL_CFLAGS += -D_BSD_SOURCE
 
 ifeq ($(DHCPCD_USE_IPV6), yes)