From f8bb007ed62fbcc2a0b971aaaa2e1429d86fbbd8 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Tue, 1 Oct 2013 12:02:53 -0700 Subject: wlan: update project discrimination in Android.mk The prima and qcacld-2.0 projects both use the WLAN_CHIPSET variable to keep track of whether or not the given project is supported on a given platform. The problem is that both of these assume WLAN_CHIPSET is initially empty, but that is not always the case. When both are included in an Android build, the value may be set by one of the projects, and that value will be inherited by the other project. To prevent this explicitly clear the WLAN_CHIPSET variable in both projects. Change-Id: I138efff35a1d82e5e13e43b603df350b092d4fb5 --- Android.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Android.mk b/Android.mk index ea6238f46f56..4c7fc03b978f 100644 --- a/Android.mk +++ b/Android.mk @@ -1,5 +1,8 @@ # Android makefile for the WLAN Module +# Assume no targets will be supported +WLAN_CHIPSET := + # Build/Package options for 8084 target ifeq ($(call is-board-platform,apq8084),true) WLAN_CHIPSET := qca_cld -- cgit v1.2.3