From 5ab38532119b4e3b3e128fe34dcd3e26963f198c Mon Sep 17 00:00:00 2001
From: Jouni Malinen <quic_jouni@quicinc.com>
Date: Tue, 5 Apr 2022 19:31:40 +0300
Subject: [PATCH] Revert "Android: Compile hs20-osu-client to /vendor/bin in
 test builds"

This reverts commit 1192d5721b49a77579abf469d150b9e18e32be16. That
commit disabled hostapd and wpa_supplicant build in user build variants.
Furthermore, it used duplicated TARGET_BUILD_VARIANT checks between the
Android.mk files.

Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com>
---
 Android.mk               |  8 --------
 hs20/client/Android.mk   | 16 ----------------
 hs20/client/osu_client.c |  2 +-
 3 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/Android.mk b/Android.mk
index 33672269f..bd7a40974 100644
--- a/Android.mk
+++ b/Android.mk
@@ -5,14 +5,6 @@ ifneq ($(filter VER_0_8_X VER_2_1_DEVEL,$(WPA_SUPPLICANT_VERSION)),)
 # TODO: Clean up the Android.mks, reset all the temporary variables at the
 # end of each Android.mk, so that one Android.mk doesn't depend on variables
 # set up in the other Android.mk.
-ifneq ($(TARGET_BUILD_VARIANT), user)
-ifeq ($(shell test $(PLATFORM_VERSION_LAST_STABLE) -ge 8 ; echo $$?), 0)
-include $(LOCAL_PATH)/hostapd/Android.mk \
-        $(LOCAL_PATH)/wpa_supplicant/Android.mk \
-        $(LOCAL_PATH)/hs20/client/Android.mk
-else
 include $(LOCAL_PATH)/hostapd/Android.mk \
         $(LOCAL_PATH)/wpa_supplicant/Android.mk
-endif #End of Check for platform version
-endif #End of Check for target build variant
 endif
diff --git a/hs20/client/Android.mk b/hs20/client/Android.mk
index 4d2e5d117..e4db32208 100644
--- a/hs20/client/Android.mk
+++ b/hs20/client/Android.mk
@@ -60,14 +60,6 @@ L_CFLAGS += -DEAP_TLS_OPENSSL
 
 L_CFLAGS += -Wno-unused-parameter
 
-ifneq ($(TARGET_BUILD_VARIANT), user)
-ifeq ($(shell test $(PLATFORM_VERSION_LAST_STABLE) -ge 8 ; echo $$?), 0)
-L_CFLAGS += -DCONFIG_ANDROID_LOG
-L_CFLAGS += -DANDROID_LOG_NAME='"hs20-osu-client"'
-L_CFLAGS += -Wno-error-deprecated-declarations
-L_CFLAGS += -Wno-unused-variable
-endif
-endif
 
 ########################
 include $(CLEAR_VARS)
@@ -76,17 +68,9 @@ LOCAL_MODULE_TAGS := optional
 
 LOCAL_SHARED_LIBRARIES := libc libcutils
 LOCAL_SHARED_LIBRARIES += libcrypto libssl
-ifneq ($(TARGET_BUILD_VARIANT), user)
-ifeq ($(shell test $(PLATFORM_VERSION_LAST_STABLE) -ge 8 ; echo $$?), 0)
-LOCAL_VENDOR_MODULE := true
-LOCAL_SHARED_LIBRARIES += libxml2
-LOCAL_SHARED_LIBRARIES += liblog
-else
 #LOCAL_SHARED_LIBRARIES += libxml2
 LOCAL_STATIC_LIBRARIES += libxml2
 LOCAL_SHARED_LIBRARIES += libicuuc
-endif
-endif
 LOCAL_SHARED_LIBRARIES += libcurl
 
 LOCAL_CFLAGS := $(L_CFLAGS)
diff --git a/hs20/client/osu_client.c b/hs20/client/osu_client.c
index f9600250b..7b274dac9 100644
--- a/hs20/client/osu_client.c
+++ b/hs20/client/osu_client.c
@@ -10,7 +10,7 @@
 #include <time.h>
 #include <sys/stat.h>
 #ifdef ANDROID
-#include "cutils/android_filesystem_config.h"
+#include "private/android_filesystem_config.h"
 #endif /* ANDROID */
 
 #include "common.h"