From: Jouni Malinen <jouni@qca.qualcomm.com>
Date: Tue, 15 Nov 2011 16:35:58 +0000 (+0200)
Subject: Android: Fix D-Bus P2P interface location in Android.mk
X-Git-Tag: aosp-jb-start~329
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c84443307b99093acbd032d7812cfd8e7e54d393;p=thirdparty%2Fhostap.git

Android: Fix D-Bus P2P interface location in Android.mk

This was supposed to be in the new D-Bus interface block, not in
the old one.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
---

diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk
index 7a76bc466..d2fa7db55 100644
--- a/wpa_supplicant/Android.mk
+++ b/wpa_supplicant/Android.mk
@@ -1164,9 +1164,6 @@ DBUS_OBJS += dbus/dbus_old.c dbus/dbus_old_handlers.c
 ifdef CONFIG_WPS
 DBUS_OBJS += dbus/dbus_old_handlers_wps.c
 endif
-ifdef CONFIG_P2P
-DBUS_OBJS += dbus/dbus_new_handlers_p2p.c
-endif
 DBUS_OBJS += dbus/dbus_dict_helpers.c
 ifndef DBUS_LIBS
 DBUS_LIBS := $(shell $(PKG_CONFIG) --libs dbus-1)
@@ -1197,6 +1194,9 @@ DBUS_OBJS += dbus/dbus_new.c dbus/dbus_new_handlers.c
 ifdef CONFIG_WPS
 DBUS_OBJS += dbus/dbus_new_handlers_wps.c
 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