>From b5844dcc755cc76dc8ef7e3062ed4c55ad288f6c Mon Sep 17 00:00:00 2001 From: Samuel Tan <samueltan@xxxxxxxxxx> Date: Thu, 5 Nov 2015 10:48:48 -0800 Subject: [PATCH] external/wpa_supplicant8: Use libdbus rather than dbus-1 The upstream wpa_supplicant uses the dbus-1 library when it is compiled with D-Bus support. In Android, we imported the D-Bus shared libraries under the name "libdbus", so use this shared library instead of dbus-1 when compiling WPA supplicant with D-Bus support. Signed-off-by: Samuel Tan <samueltan@xxxxxxxxxx> --- wpa_supplicant/Android.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk index ef698d0..50e3422 100644 --- a/wpa_supplicant/Android.mk +++ b/wpa_supplicant/Android.mk @@ -1343,12 +1343,6 @@ ifdef CONFIG_WPS DBUS_OBJS += dbus/dbus_old_handlers_wps.c endif DBUS_OBJS += dbus/dbus_dict_helpers.c -ifndef DBUS_LIBS -DBUS_LIBS := $(shell $(PKG_CONFIG) --libs dbus-1) -endif -ifndef DBUS_INCLUDE -DBUS_INCLUDE := $(shell $(PKG_CONFIG) --cflags dbus-1) -endif DBUS_CFLAGS += $(DBUS_INCLUDE) endif @@ -1364,12 +1358,6 @@ endif ifdef CONFIG_P2P DBUS_OBJS += dbus/dbus_new_handlers_p2p.c endif -ifndef DBUS_LIBS -DBUS_LIBS := $(shell $(PKG_CONFIG) --libs dbus-1) -endif -ifndef DBUS_INCLUDE -DBUS_INCLUDE := $(shell $(PKG_CONFIG) --cflags dbus-1) -endif ifdef CONFIG_CTRL_IFACE_DBUS_INTRO DBUS_OBJS += dbus/dbus_new_introspect.c DBUS_CFLAGS += -DCONFIG_CTRL_IFACE_DBUS_INTRO @@ -1384,7 +1372,6 @@ endif OBJS += $(DBUS_OBJS) L_CFLAGS += $(DBUS_CFLAGS) -LIBS += $(DBUS_LIBS) ifdef CONFIG_READLINE OBJS_c += src/utils/edit_readline.c @@ -1626,6 +1613,9 @@ endif LOCAL_CFLAGS := $(L_CFLAGS) LOCAL_SRC_FILES := $(OBJS) LOCAL_C_INCLUDES := $(INCLUDES) +ifeq ($(DBUS), y) +LOCAL_SHARED_LIBRARIES += libdbus +endif include $(BUILD_EXECUTABLE) ######################## -- 2.6.0.rc2.230.g3dd15c0 _______________________________________________ Hostap mailing list Hostap@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/hostap
