Merge ~vicamo/libhybris/+git/libhybris:for-libhybris-maintainers/fix-wifi-h-not-found into ~libhybris-maintainers/libhybris/+git/libhybris:staging

[You-Sheng Yang]

wifi: fix hardware_legacy/wifi.h not found

Android headers were supposed to be installed to /usr/include. When it's not the case, even with a correct C include path set for Android headers, the build still fails with "hardware_legacy/wifi.h not found".

This patch removes the redundant level of directory from wifi related include directives.

[You-Sheng Yang (vicamo)]

Actually prefixing a package name as namespace in the include directives is a safe policy that we should really enforce, but that takes several parties, pkg-config, down-stream projects to cooperate. This patch simply removes android/ as others do.

It should be fine for now to enforce such prefix policy in libhybris source code if that's what we decide to head to. And the decision here may affect the layout of android-headers package as well. See https://code.launchpad.net/~vicamo/android-headers/+git/android-headers/+merge/278111

[Simon Fels (morphis)]

LGTM

review: Approve

[You-Sheng Yang (vicamo)]

Really want to land this to reduce differences between libhybris central and zhongshan's fork.

diff --git a/hybris/tests/test_wifi.c b/hybris/tests/test_wifi.c
index e37f992..71bb7fe 100644
--- a/hybris/tests/test_wifi.c
+++ b/hybris/tests/test_wifi.c
@@ -17,8 +17,8 @@
 
 #include <stdio.h>
 
-#include <android/android-config.h>
-#include <android/hardware_legacy/wifi.h>
+#include <android-config.h>
+#include <hardware_legacy/wifi.h>
 
 #define COMMAND_LOAD_WIFI "1"
 #define COMMAND_UNLOAD_WIFI "0"
diff --git a/hybris/wifi/wifi.c b/hybris/wifi/wifi.c
index 51bb255..cae41ed 100644
--- a/hybris/wifi/wifi.c
+++ b/hybris/wifi/wifi.c
@@ -20,7 +20,7 @@
 #include <stddef.h>
 
 #include <hybris/common/binding.h>
-#include <android/hardware_legacy/wifi.h>
+#include <hardware_legacy/wifi.h>
 
 #define COMPAT_LIBRARY_PATH "/system/lib/libhardware_legacy.so"