AI 146935: am: CL 146934 Make TI Wifi driver choice framework-indepen…

…dent - part 1

  Original author: dimitrysh

Automated import of CL 146935

Android.mk

@@ -15,11 +15,9 @@
 #
 
 ifneq ($(TARGET_SIMULATOR),true)
-  system_wlan_ti_path := $(my-dir)
   # The board config file for the product must define BOARD_WLAN_TI_STA_DK_ROOT
   # in order to build the TI wlan components.
   ifdef BOARD_WLAN_TI_STA_DK_ROOT
     include $(BOARD_WLAN_TI_STA_DK_ROOT)/Android.mk
-    include $(system_wlan_ti_path)/wpa_supplicant_lib/Android.mk
   endif
 endif

sta_dk_4_0_4_32/config/Android.mk

@@ -0,0 +1,48 @@
+#
+# 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)
+
+########################
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := wpa_supplicant.conf
+LOCAL_MODULE_TAGS := user
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/wifi
+LOCAL_SRC_FILES := $(LOCAL_MODULE)
+include $(BUILD_PREBUILT)
+
+########################
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := tiwlan.ini
+LOCAL_MODULE_TAGS := user
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/wifi
+LOCAL_SRC_FILES := $(LOCAL_MODULE)
+include $(BUILD_PREBUILT)
+
+########################
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := dhcpcd.conf
+LOCAL_MODULE_TAGS := user
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/dhcpcd
+LOCAL_SRC_FILES := android_dhcpcd.conf
+include $(BUILD_PREBUILT)
+
+########################

sta_dk_4_0_4_32/config/android_dhcpcd.conf

@@ -0,0 +1,6 @@
+# dhcpcd configuration for Android Wi-Fi interface
+# See dhcpcd.conf(5) for details.
+
+interface tiwlan0
+# dhcpcd-run-hooks uses these options.
+option subnet_mask, routers, domain_name_servers

wpa_supplicant_lib/Android.mk → sta_dk_4_0_4_32/wpa_supplicant_lib/Android.mk

@@ -14,7 +14,6 @@
 # limitations under the License.
 #
 LOCAL_PATH := $(call my-dir)
-STA_DK_ROOT = $(LOCAL_PATH)/../..
 
 # This makefile is only included if BOARD_WLAN_TI_STA_DK_ROOT is set,
 # and if we're not building for the simulator.
@@ -132,7 +131,7 @@ L_CFLAGS += -DCONFIG_DRIVER_CUSTOM -DHOST_COMPILE
 ifeq ($(notdir $(BOARD_WLAN_TI_STA_DK_ROOT)),sta_dk_5_0_0_94)
 L_CFLAGS += -DSTA_DK_VER_5_0_0_94 
 endif
-OBJS = driver_ti.c scanmerge.c ../../../core/adb/shlist.c
+OBJS = driver_ti.c scanmerge.c ../../../../core/adb/shlist.c
 
 ifdef CONFIG_NO_STDOUT_DEBUG
 L_CFLAGS += -DCONFIG_NO_STDOUT_DEBUG