NAN hardware feature definition

Hardware feature controls whether Wifi NAN service starts
at run-time.

NAN feature build config controls whether Wifi NAN service
is built into image.

Bug: 27430056
Change-Id: Ie52f42c4f8834daedfe1e271fa265fa0056edd9f
diff --git a/BoardConfig.mk b/BoardConfig.mk
index f2d8c5f..f74234a 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -59,6 +59,7 @@
 BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_$(BOARD_WLAN_DEVICE)
 WIFI_DRIVER_FW_PATH_STA := "sta"
 WIFI_DRIVER_FW_PATH_AP  := "ap"
+BOARD_HAS_NAN := true
 
 BOARD_USES_SECURE_SERVICES := true
 
diff --git a/device.mk b/device.mk
index 3d5737d..896c7f7 100644
--- a/device.mk
+++ b/device.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2015 The Android Open-Source Project
+# Copyright (C) 2016 The Android Open-Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -91,6 +91,7 @@
     frameworks/native/data/etc/android.hardware.fingerprint.xml:system/etc/permissions/android.hardware.fingerprint.xml \
     frameworks/native/data/etc/android.hardware.location.gps.xml:system/etc/permissions/android.hardware.location.gps.xml \
     frameworks/native/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \
+    frameworks/native/data/etc/android.hardware.wifi.nan.xml:system/etc/permissions/android.hardware.wifi.nan.xml \
     frameworks/native/data/etc/android.hardware.wifi.direct.xml:system/etc/permissions/android.hardware.wifi.direct.xml \
     frameworks/native/data/etc/android.hardware.sensor.proximity.xml:system/etc/permissions/android.hardware.sensor.proximity.xml \
     frameworks/native/data/etc/android.hardware.sensor.light.xml:system/etc/permissions/android.hardware.sensor.light.xml \