diff options
| author | Samuel Tan <samueltan@google.com> | 2015-10-02 13:00:47 -0700 |
|---|---|---|
| committer | Samuel Tan <samueltan@google.com> | 2015-10-02 14:42:55 -0700 |
| commit | 163504716e7aae6d481e209c88c70ac8a20f45ed (patch) | |
| tree | d5d62c1394925ba3917182b4186e2db990bdcbd7 | |
| parent | e1320b13769c96414d2b89f4a0847e119efb1412 (diff) | |
| download | dhcpcd-6.8.2-163504716e7aae6d481e209c88c70ac8a20f45ed.tar.gz | |
dhcpcd-6.8.2: comment out dhcpcd-6.8.2.conf target
Comment out this target and note that each target using
dhcpcd-6.8.2 should define its own source and destination
for the dhcpcd.conf file.
While there, remove android.conf since it is no longer
used by any target in dhcpcd-6.8.2.
BUG: None
Change-Id: I68d740633ab4d7e42e9661a7443ca53cb25aa4cc
| -rw-r--r-- | Android.mk | 14 | ||||
| -rwxr-xr-x | android.conf | 24 |
2 files changed, 8 insertions, 30 deletions
@@ -75,9 +75,11 @@ LOCAL_CFLAGS += -Wno-maybe-uninitialized LOCAL_SHARED_LIBRARIES += libc libcutils libnetutils include $(BUILD_EXECUTABLE) -include $(CLEAR_VARS) -LOCAL_MODULE := dhcpcd-6.8.2.conf -LOCAL_MODULE_CLASS := ETC -LOCAL_MODULE_PATH := $(TARGET_OUT)/etc/dhcpcd-6.8.2 -LOCAL_SRC_FILES := android.conf -include $(BUILD_PREBUILT) +# Each build target using dhcpcd-6.8.2 should define its own source +# and destination for its dhcpcd.conf file. +# include $(CLEAR_VARS) +# LOCAL_MODULE := dhcpcd-6.8.2.conf +# LOCAL_MODULE_CLASS := ETC +# LOCAL_MODULE_PATH := $(TARGET_OUT)/etc/dhcpcd-6.8.2 +# LOCAL_SRC_FILES := android.conf +# include $(BUILD_PREBUILT) diff --git a/android.conf b/android.conf deleted file mode 100755 index 79ae06b..0000000 --- a/android.conf +++ /dev/null @@ -1,24 +0,0 @@ -# dhcpcd-6.8.2 configuration for Android Wi-Fi interface -# See dhcpcd.conf(5) for details. - -# disable ARP checking -noarp -# no link state monitoring -nolink - -# Inform the DHCP server of our hostname for DDNS. -hostname -# To share the DHCP lease across OSX and Windows a ClientID is needed. -# Enabling this may get a different lease than the kernel DHCP client. -# Some upstream DHCP servers may also require a ClientID, such as FRITZ!Box. -clientid - -# A list of options to request from the DHCP server. -option domain_name_servers, domain_name, domain_search, host_name, wpad_url -option classless_static_routes -# Most distributions have NTP support. -#option ntp_servers -# Respect the network MTU. -option interface_mtu -# A ServerID is required by RFC2131. -require dhcp_server_identifier |