Merge commit 'remotes/korg/cupcake'

Conflicts:
	wpa_supplicant_lib/Android.mk

diff --cc wpa_supplicant_lib/Android.mk
index 92c00e5,0aec192..0e07013
--- 1/wpa_supplicant_lib/Android.mk
--- 2/wpa_supplicant_lib/Android.mk
+++ b/wpa_supplicant_lib/Android.mk
@@@ -1,12 -1,32 +1,32 @@@
+ #
+ # Copyright (C) 2008 The Android Open Source Project
+ #
+ # Licensed under the Apache License, Version 2.0 (the "License");
+ # you may not use this file except in compliance with the License.
+ # You may obtain a copy of the License at
+ #
+ #      http://www.apache.org/licenses/LICENSE-2.0
+ #
+ # Unless required by applicable law or agreed to in writing, software
+ # distributed under the License is distributed on an "AS IS" BASIS,
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+ #
  LOCAL_PATH := $(call my-dir)
- WPA_BUILD_SUPPLICANT_LIB := false
- ifeq ($(HAVE_CUSTOM_WIFI_DRIVER_2),true)
- WPA_BUILD_SUPPLICANT_LIB := true
 -STA_DK_ROOT = $(LOCAL_PATH)/../..
 +STA_DK_ROOT = $(LOCAL_PATH)/../sta_dk_4_0_4_32
+ 
+ # This makefile is only included if BOARD_WLAN_TI_STA_DK_ROOT is set,
+ # and if we're not building for the simulator.
+ ifndef BOARD_WLAN_TI_STA_DK_ROOT
+   $(error BOARD_WLAN_TI_STA_DK_ROOT must be defined when including this makefile)
+ endif
+ ifeq ($(TARGET_SIMULATOR),true)
+   $(error This makefile must not be included when building the simulator)
  endif
  
- DK_ROOT = $(STA_DK_ROOT)
- OS_ROOT = $(STA_DK_ROOT)/pform
+ DK_ROOT = $(BOARD_WLAN_TI_STA_DK_ROOT)
+ OS_ROOT = $(BOARD_WLAN_TI_STA_DK_ROOT)/pform
  COMMON  = $(DK_ROOT)/common
  COMSRC  = $(COMMON)/src
  CUDK_ROOT = $(DK_ROOT)/CUDK