DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Revert "Android: Compile hs20-osu-client to /vendor/bin in test builds"

Browse source 
This reverts commit 1192d5721b. 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>
This commit is contained in:
Jouni Malinen 2022-04-05 19:31:40 +03:00 committed by Jouni Malinen
parent e955998220
commit 5ab3853211
3 changed files with 1 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Android.mk
View file

@ -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 # 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 # end of each Android.mk, so that one Android.mk doesn't depend on variables
# set up in the other Android.mk. # 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 \ include $(LOCAL_PATH)/hostapd/Android.mk \
$(LOCAL_PATH)/wpa_supplicant/Android.mk $(LOCAL_PATH)/wpa_supplicant/Android.mk
endif #End of Check for platform version
endif #End of Check for target build variant
endif endif

16
hs20/client/Android.mk
View file

@ -60,14 +60,6 @@ L_CFLAGS += -DEAP_TLS_OPENSSL
L_CFLAGS += -Wno-unused-parameter 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) include $(CLEAR_VARS)
@ -76,17 +68,9 @@ LOCAL_MODULE_TAGS := optional
LOCAL_SHARED_LIBRARIES := libc libcutils LOCAL_SHARED_LIBRARIES := libc libcutils
LOCAL_SHARED_LIBRARIES += libcrypto libssl 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_SHARED_LIBRARIES += libxml2
LOCAL_STATIC_LIBRARIES += libxml2 LOCAL_STATIC_LIBRARIES += libxml2
LOCAL_SHARED_LIBRARIES += libicuuc LOCAL_SHARED_LIBRARIES += libicuuc
endif
endif
LOCAL_SHARED_LIBRARIES += libcurl LOCAL_SHARED_LIBRARIES += libcurl
LOCAL_CFLAGS := $(L_CFLAGS) LOCAL_CFLAGS := $(L_CFLAGS)

2
hs20/client/osu_client.c
View file

@ -10,7 +10,7 @@
#include <time.h> #include <time.h>
#include <sys/stat.h> #include <sys/stat.h>
#ifdef ANDROID #ifdef ANDROID
#include "cutils/android_filesystem_config.h" #include "private/android_filesystem_config.h"
#endif /* ANDROID */ #endif /* ANDROID */
#include "common.h" #include "common.h"