From: Jouni Malinen <j@w1.fi>
Date: Fri, 1 Nov 2013 10:11:14 +0000 (+0200)
Subject: AOSP: Unidentified hostapd/Android.mk change
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89dd25df3ff3cd20d1465cdce400372819dff199;p=thirdparty%2Fhostap.git

AOSP: Unidentified hostapd/Android.mk change

This came as part of the following AOSP commit, but was not in upstream
at the time:

commit 391c59f0632df8db1c325da1d31d479b2eedce45
Author: Dmitry Shmidt <dimitrysh@google.com>
Date:   Tue Sep 3 12:16:28 2013 -0700

    Cumulative patch from commit b2b688d18d40cd667d0faa149b4a7172166b3bd4

    b2b688d P2P: Fix crash when failed to create GO interface
    6197169 WPS NFC: Fix build without CONFIG_AP=y
    e1ae5d7 SAE: Fix build without CONFIG_AP=y
    813e7b3 P2P: Remove group from timeout on PSK failure
    5bf9a6c P2P: Add event messages for possible PSK failures on P2P groups
    eac8dab P2P: Document per-client keys and p2p_remove_client
    43c693c P2P: Do not store duplicate PSK entries for the same device
    f2c5660 P2P: Add a command for removing a client from all groups
    01a57fe P2P: Maintain list of per-client PSKs for persistent groups
    759fd76 P2P: Select PSK based on Device Address instead of Interface Address
    94ddef3 P2P: Make peer's P2P Device Address available to authenticator
    52177fb P2P: Store P2P Device Address in per-device PSK records
    05766ed P2P: Allow per-device PSK to be assigned
    698e921 wpa_cli: Add tab completion for p2p_set field values
    0b5fb86 P2P: Stop listen state when listen-only duration is over
    02a3e5c wpa_cli: Allow first DISCONNECTED event to be reported
    cdf8bfa Disallow WEP configuration in WPA network
    731ef43 D-Bus: Fix per-iface object unregistration on not existing objects
    447969e D-Bus: Do not send network notification for all P2P groups
    eb32460 Fix switching from EAP-SIM to EAP-AKA/AKA'
    f2b3f4d P2P: Allow P2P functionality to be disabled per interface
    50f4f2a hostapd: Add Automatic Channel Selection (ACS) support
    43ee470 P2P: Immediate group removal in GC in case of deauthentication
    fcf2052 Fix MNC length for Swisscom SIM cards

    Bug: 10606228, 10513949

    Change-Id: I63ba0e2ab4fa76e6afa7a34be42e8e847e1511b0
    Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
---

diff --git a/hostapd/Android.mk b/hostapd/Android.mk
index fb7fb79b7..9c0e80288 100644
--- a/hostapd/Android.mk
+++ b/hostapd/Android.mk
@@ -874,6 +874,12 @@ else
 OBJS_c += src/utils/edit_simple.c
 endif
 
+ifdef CONFIG_ACS
+L_CFLAGS += -DCONFIG_ACS
+OBJS += src/ap/acs.c
+LIBS += -lm
+endif
+
 ########################
 
 include $(CLEAR_VARS)