am add8ef15: am 42bc7ae1: am d60e69ac: Check SSID length before association (http://b/issue?id=2198151)
Merge commit 'add8ef1554033c76917c5a48d3ba386cbd9e2a3d'
* commit 'add8ef1554033c76917c5a48d3ba386cbd9e2a3d':
Check SSID length before association (http://b/issue?id=2198151)
diff --git a/sta_dk_4_0_4_32/CUDK/tiwlan_loader/Android.mk b/sta_dk_4_0_4_32/CUDK/tiwlan_loader/Android.mk
index 1d828db..1851248 100644
--- a/sta_dk_4_0_4_32/CUDK/tiwlan_loader/Android.mk
+++ b/sta_dk_4_0_4_32/CUDK/tiwlan_loader/Android.mk
@@ -79,7 +79,7 @@
else
LOCAL_SHARED_LIBRARIES := libWifiApi
endif
-LOCAL_SHARED_LIBRARIES += libc libhardware_legacy
+LOCAL_SHARED_LIBRARIES += libcutils liblog libc libhardware_legacy
INCLUDES = $(DK_INCS) $(CLI_STA_DK_ROOT)/pform/linux/inc \
$(CLI_CUDK_ROOT)/Inc \
diff --git a/wilink_6_1/platforms/os/linux/zoom2_env.bash b/wilink_6_1/platforms/os/linux/zoom2_env.bash
index 5d5d4a5..f1a216b 100644
--- a/wilink_6_1/platforms/os/linux/zoom2_env.bash
+++ b/wilink_6_1/platforms/os/linux/zoom2_env.bash
@@ -1,4 +1,4 @@
export CROSS_COMPILE=arm-eabi-
export ARCH=arm
export HOST_PLATFORM=zoom2
-export KERNEL_DIR=/usr/local/google/android/eclair-mr2/kernel
+export KERNEL_DIR=/usr/local/google/android/master/kernel
\ No newline at end of file
