Push wpa_supplicant modules down to the leaf product config.

Since 558477c0b2a5a7db679c1ad7551d43e6364d1df2 in
external/wpa_supplicant_8 we don't need those modules if
WPA_SUPPLICANT_VERSION is not set by the BoardConfig.mk.

Actually the generic devices don't need them.

Change-Id: Iff7c1fbf483bd16d5f898836c4e7401d56def80f

8 files changed, 3 insertions, 20 deletions

diff --git a/target/board/generic/BoardConfig.mk b/target/board/generic/BoardConfig.mk
index 5fdbd1b..8f698ec 100644
--- a/target/board/generic/BoardConfig.mk
+++ b/target/board/generic/BoardConfig.mk
@@ -38,8 +38,6 @@ ifeq ($(HOST_OS),linux)
   endif
 endif
 
-WPA_SUPPLICANT_VERSION := VER_0_8_X
-
 # Build OpenGLES emulation guest and host libraries
 BUILD_EMULATOR_OPENGL := true
 
diff --git a/target/board/generic_aarch64/BoardConfig.mk b/target/board/generic_aarch64/BoardConfig.mk
index f03122b..b4dfa97 100644
--- a/target/board/generic_aarch64/BoardConfig.mk
+++ b/target/board/generic_aarch64/BoardConfig.mk
@@ -35,8 +35,6 @@ endif
 # Build OpenGLES emulation host and guest libraries
 BUILD_EMULATOR_OPENGL := true
 
-WPA_SUPPLICANT_VERSION := VER_0_8_X
-
 # Build and enable the OpenGL ES View renderer. When running on the emulator,
 # the GLES renderer disables itself if host GL acceleration isn't available.
 USE_OPENGL_RENDERER := true
diff --git a/target/board/generic_mips/BoardConfig.mk b/target/board/generic_mips/BoardConfig.mk
index 4648a90..e6f43af 100644
--- a/target/board/generic_mips/BoardConfig.mk
+++ b/target/board/generic_mips/BoardConfig.mk
@@ -42,8 +42,6 @@ ifeq ($(HOST_OS),linux)
   endif
 endif
 
-WPA_SUPPLICANT_VERSION := VER_0_8_X
-
 # Build OpenGLES emulation guest and host libraries
 BUILD_EMULATOR_OPENGL := true
 
diff --git a/target/board/generic_x86/BoardConfig.mk b/target/board/generic_x86/BoardConfig.mk
index b86fcef..ed7da38 100644
--- a/target/board/generic_x86/BoardConfig.mk
+++ b/target/board/generic_x86/BoardConfig.mk
@@ -27,8 +27,6 @@ ifeq ($(HOST_OS),linux)
 WITH_DEXPREOPT := true
 endif
 
-WPA_SUPPLICANT_VERSION := VER_0_8_X
-
 # Build OpenGLES emulation host and guest libraries
 BUILD_EMULATOR_OPENGL := true
 
diff --git a/target/board/generic_x86_64/BoardConfig.mk b/target/board/generic_x86_64/BoardConfig.mk
index 60dd339..8a2fd13 100755
--- a/target/board/generic_x86_64/BoardConfig.mk
+++ b/target/board/generic_x86_64/BoardConfig.mk
@@ -27,8 +27,6 @@ ifeq ($(HOST_OS),linux)
 WITH_DEXPREOPT := true
 endif
 
-WPA_SUPPLICANT_VERSION := VER_0_8_X
-
 # Build OpenGLES emulation host and guest libraries
 BUILD_EMULATOR_OPENGL := true
 
diff --git a/target/product/base.mk b/target/product/base.mk
index 194f356..7c60447 100644
--- a/target/product/base.mk
+++ b/target/product/base.mk
@@ -80,7 +80,6 @@ PRODUCT_PACKAGES += \
     libutils \
     libvisualizer \
     libvorbisidec \
-    libwpa_client \
     media \
     media_cmd \
     mediaserver \
diff --git a/target/product/core_tiny.mk b/target/product/core_tiny.mk
index 3d0dfff..f2b109b 100644
--- a/target/product/core_tiny.mk
+++ b/target/product/core_tiny.mk
@@ -21,9 +21,7 @@ PRODUCT_PACKAGES := \
     CertInstaller \
     FusedLocation \
     InputDevices \
-    bluetooth-health \
-    hostapd \
-    wpa_supplicant.conf
+    bluetooth-health
 
 PRODUCT_PACKAGES += \
     audio \
@@ -33,8 +31,7 @@ PRODUCT_PACKAGES += \
     network \
     pand \
     pppd \
-    sdptool \
-    wpa_supplicant
+    sdptool
 
 PRODUCT_PACKAGES += \
     audio.primary.default \
diff --git a/target/product/generic_no_telephony.mk b/target/product/generic_no_telephony.mk
index f1f0030..c319db6 100644
--- a/target/product/generic_no_telephony.mk
+++ b/target/product/generic_no_telephony.mk
@@ -27,8 +27,6 @@ PRODUCT_PACKAGES := \
     Provision \
     SystemUI \
     bluetooth-health \
-    hostapd \
-    wpa_supplicant.conf \
     WallpaperCropper
 
 PRODUCT_PACKAGES += \
@@ -39,8 +37,7 @@ PRODUCT_PACKAGES += \
     network \
     pand \
     pppd \
-    sdptool \
-    wpa_supplicant
+    sdptool
 
 PRODUCT_PACKAGES += \
     librs_jni \