jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Android: Use libdbus rather than dbus-1

Browse source 
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@google.com>
This commit is contained in:
Samuel Tan 2015-11-05 10:48:48 -08:00 committed by Jouni Malinen
parent 5b75ecead3
commit 3b49719130
1 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
wpa_supplicant/Android.mk
View file

@ -1343,12 +1343,6 @@ ifdef CONFIG_WPS
DBUS_OBJS += dbus/dbus_old_handlers_wps.c DBUS_OBJS += dbus/dbus_old_handlers_wps.c
endif endif
DBUS_OBJS += dbus/dbus_dict_helpers.c 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) DBUS_CFLAGS += $(DBUS_INCLUDE)
endif endif
@ -1364,12 +1358,6 @@ endif
ifdef CONFIG_P2P ifdef CONFIG_P2P
DBUS_OBJS += dbus/dbus_new_handlers_p2p.c DBUS_OBJS += dbus/dbus_new_handlers_p2p.c
endif 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 ifdef CONFIG_CTRL_IFACE_DBUS_INTRO
DBUS_OBJS += dbus/dbus_new_introspect.c DBUS_OBJS += dbus/dbus_new_introspect.c
DBUS_CFLAGS += -DCONFIG_CTRL_IFACE_DBUS_INTRO DBUS_CFLAGS += -DCONFIG_CTRL_IFACE_DBUS_INTRO
@ -1384,7 +1372,6 @@ endif
OBJS += $(DBUS_OBJS) OBJS += $(DBUS_OBJS)
L_CFLAGS += $(DBUS_CFLAGS) L_CFLAGS += $(DBUS_CFLAGS)
LIBS += $(DBUS_LIBS)
ifdef CONFIG_READLINE ifdef CONFIG_READLINE
OBJS_c += src/utils/edit_readline.c OBJS_c += src/utils/edit_readline.c
@ -1626,6 +1613,9 @@ endif
LOCAL_CFLAGS := $(L_CFLAGS) LOCAL_CFLAGS := $(L_CFLAGS)
LOCAL_SRC_FILES := $(OBJS) LOCAL_SRC_FILES := $(OBJS)
LOCAL_C_INCLUDES := $(INCLUDES) LOCAL_C_INCLUDES := $(INCLUDES)
ifeq ($(DBUS), y)
LOCAL_SHARED_LIBRARIES += libdbus
endif
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)
######################## ########################