diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2011-06-30 16:51:41 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2011-06-30 16:53:28 -0700 |
| commit | 13970b010f3e5b274336677311a5586410ecc8fa (patch) | |
| tree | 95206fd79aed88c33c41fc33b34a4cd4b10d1c3d | |
| parent | a772296a3a934661ad66a83744b7f63309248651 (diff) | |
| download | android_external_wpa_supplicant_8-13970b010f3e5b274336677311a5586410ecc8fa.tar.gz android_external_wpa_supplicant_8-13970b010f3e5b274336677311a5586410ecc8fa.tar.bz2 android_external_wpa_supplicant_8-13970b010f3e5b274336677311a5586410ecc8fa.zip | |
Update Android.mk files
Change-Id: I43a00f59599d6d6faf538dc0bb595f95ada3014b
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| -rw-r--r-- | hostapd/Android.mk | 2 | ||||
| -rw-r--r-- | wpa_supplicant/Android.mk | 12 |
2 files changed, 11 insertions, 3 deletions
diff --git a/hostapd/Android.mk b/hostapd/Android.mk index a2772c23..bf9bb6a1 100644 --- a/hostapd/Android.mk +++ b/hostapd/Android.mk @@ -32,7 +32,7 @@ INCLUDES += $(LOCAL_PATH)/src/utils INCLUDES += external/openssl/include INCLUDES += frameworks/base/cmds/keystore ifdef CONFIG_DRIVER_NL80211 -INCLUDES += external/libnl_2/include +INCLUDES += system/core/libnl_2/include endif diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk index fffb1f8c..6cbfe8e3 100644 --- a/wpa_supplicant/Android.mk +++ b/wpa_supplicant/Android.mk @@ -66,7 +66,7 @@ INCLUDES += $(LOCAL_PATH)/src/wps INCLUDES += external/openssl/include INCLUDES += frameworks/base/cmds/keystore ifdef CONFIG_DRIVER_NL80211 -INCLUDES += external/libnl_2/include +INCLUDES += system/core/libnl_2/include endif OBJS = config.c @@ -1045,7 +1045,9 @@ ifdef NEED_FIPS186_2_PRF SHA1OBJS += src/crypto/fips_prf_internal.c endif endif -ifndef CONFIG_NO_WPA_PASSPHRASE +ifdef CONFIG_NO_WPA_PASSPHRASE +L_CFLAGS += -DCONFIG_NO_PBKDF2 +else SHA1OBJS += src/crypto/sha1-pbkdf2.c endif ifdef NEED_T_PRF @@ -1173,6 +1175,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 @@ -1262,6 +1267,9 @@ endif ifdef CONFIG_DEBUG_SYSLOG L_CFLAGS += -DCONFIG_DEBUG_SYSLOG +ifdef CONFIG_DEBUG_SYSLOG_FACILITY +L_CFLAGS += -DLOG_HOSTAPD="$(CONFIG_DEBUG_SYSLOG_FACILITY)" +endif endif ifdef CONFIG_DEBUG_FILE |