From 17fc3d2ac1d16fbc0a0df1b3cd40ac62abb6203e Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Mon, 25 Nov 2013 12:56:25 -0800 Subject: [PATCH] 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 Conflicts: target/product/core_tiny.mk --- target/board/generic/BoardConfig.mk | 2 -- target/board/generic_aarch64/BoardConfig.mk | 2 -- target/board/generic_mips/BoardConfig.mk | 2 -- target/board/generic_x86/BoardConfig.mk | 2 -- target/board/generic_x86_64/BoardConfig.mk | 2 -- target/product/base.mk | 1 - target/product/generic_no_telephony.mk | 5 +---- 7 files changed, 1 insertion(+), 15 deletions(-) diff --git a/target/board/generic/BoardConfig.mk b/target/board/generic/BoardConfig.mk index 5fdbd1b827..8f698ec39f 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 f03122b83e..b4dfa97301 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 4648a90aac..e6f43af104 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 b86fceff0b..ed7da3856f 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 60dd33946a..8a2fd134cd 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 c8f4354549..ec263e5c63 100644 --- a/target/product/base.mk +++ b/target/product/base.mk @@ -77,7 +77,6 @@ PRODUCT_PACKAGES += \ libutils \ libvisualizer \ libvorbisidec \ - libwpa_client \ media \ media_cmd \ mediaserver \ diff --git a/target/product/generic_no_telephony.mk b/target/product/generic_no_telephony.mk index 1155b4e7ce..5197166508 100644 --- a/target/product/generic_no_telephony.mk +++ b/target/product/generic_no_telephony.mk @@ -45,8 +45,6 @@ PRODUCT_PACKAGES := \ TeleService \ CalendarProvider \ bluetooth-health \ - hostapd \ - wpa_supplicant.conf \ WallpaperCropper PRODUCT_PACKAGES += \ @@ -57,8 +55,7 @@ PRODUCT_PACKAGES += \ network \ pand \ pppd \ - sdptool \ - wpa_supplicant + sdptool PRODUCT_PACKAGES += \ librs_jni \