From be1459971a5a262c045669aa2d279d19039e9d25 Mon Sep 17 00:00:00 2001
From: Josh Gao <jmgao@google.com>
Date: Wed, 18 Jul 2018 17:24:21 -0700
Subject: [PATCH] Hack around wifi_legacy_hal.h transitive include bug.

Bug: http://b/111617490
Test: treehugger
Merged-In: Ic98b8f253ae42107cddb90475044a063db2c666c
Change-Id: Ic98b8f253ae42107cddb90475044a063db2c666c
---
 wifi/1.1/default/wifi_legacy_hal.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/wifi/1.1/default/wifi_legacy_hal.h b/wifi/1.1/default/wifi_legacy_hal.h
index 549880398f..8e12d12b65 100644
--- a/wifi/1.1/default/wifi_legacy_hal.h
+++ b/wifi/1.1/default/wifi_legacy_hal.h
@@ -24,6 +24,12 @@
 
 #include <wifi_system/interface_tool.h>
 
+// HACK: The include inside the namespace below also transitively includes a
+// bunch of libc headers into the namespace, which leads to functions like
+// socketpair being defined in android::hardware::wifi::V1_1::implementation::legacy_hal.
+// Include this one particular header as a hacky workaround until that's fixed.
+#include <sys/socket.h>
+
 namespace android {
 namespace hardware {
 namespace wifi {