Merge pie-platform-release to aosp-master - DO NOT MERGE
Change-Id: I45ea735f8a90f515ff2fa5dfc1fa63fd4f3cb817
diff --git a/hostapd/Android.mk b/hostapd/Android.mk
index 54d12f6..c802165 100644
--- a/hostapd/Android.mk
+++ b/hostapd/Android.mk
@@ -1072,7 +1072,7 @@
OBJS_c += src/utils/edit_simple.c
endif
-ifeq ($(filter gce_x86 gce_x86_64 calypso generic_x86 generic_x86_64 generic generic_arm64, $(TARGET_DEVICE)),)
+ifeq ($(filter gce_x86 gce_x86_64 calypso, $(TARGET_DEVICE)),)
ifdef CONFIG_CTRL_IFACE_HIDL
HOSTAPD_USE_HIDL=y
L_CFLAGS += -DCONFIG_CTRL_IFACE_HIDL
@@ -1123,6 +1123,30 @@
LOCAL_INIT_RC := hostapd.android.rc
include $(BUILD_EXECUTABLE)
+########################
+include $(CLEAR_VARS)
+LOCAL_MODULE := hostapd_nohidl
+LOCAL_MODULE_TAGS := optional
+LOCAL_PROPRIETARY_MODULE := true
+ifdef CONFIG_DRIVER_CUSTOM
+LOCAL_STATIC_LIBRARIES := libCustomWifi
+endif
+ifneq ($(BOARD_HOSTAPD_PRIVATE_LIB),)
+LOCAL_STATIC_LIBRARIES += $(BOARD_HOSTAPD_PRIVATE_LIB)
+endif
+LOCAL_SHARED_LIBRARIES := libc libcutils liblog libcrypto libssl
+ifdef CONFIG_DRIVER_NL80211
+ifneq ($(wildcard external/libnl),)
+LOCAL_SHARED_LIBRARIES += libnl
+else
+LOCAL_STATIC_LIBRARIES += libnl_2
+endif
+endif
+LOCAL_CFLAGS := $(patsubst -DCONFIG_CTRL_IFACE_HIDL,,$(L_CFLAGS))
+LOCAL_SRC_FILES := $(OBJS)
+LOCAL_C_INCLUDES := $(INCLUDES)
+include $(BUILD_EXECUTABLE)
+
ifeq ($(HOSTAPD_USE_HIDL), y)
### Hidl service library ###
########################
diff --git a/hostapd/hidl/1.0/hidl.cpp b/hostapd/hidl/1.0/hidl.cpp
index 1f80c7d..a0dc50e 100644
--- a/hostapd/hidl/1.0/hidl.cpp
+++ b/hostapd/hidl/1.0/hidl.cpp
@@ -40,7 +40,6 @@
{
wpa_printf(MSG_DEBUG, "Initing hidl control");
- IPCThreadState::self()->disableBackgroundScheduling(true);
IPCThreadState::self()->setupPolling(&hidl_fd);
if (hidl_fd < 0)
goto err;
