am 18ee9e5e: Merge "Push wpa_supplicant modules down to the leaf product config."

* commit '18ee9e5e7de08933a04137e560bff87b113adb21':
  Push wpa_supplicant modules down to the leaf product config.
This commit is contained in:
Ying Wang 2013-12-05 12:25:33 -08:00 committed by Android Git Automerger
commit a395c6c1e4
7 changed files with 1 additions and 15 deletions

View file

@ -38,8 +38,6 @@ ifeq ($(HOST_OS),linux)
endif endif
endif endif
WPA_SUPPLICANT_VERSION := VER_0_8_X
# Build OpenGLES emulation guest and host libraries # Build OpenGLES emulation guest and host libraries
BUILD_EMULATOR_OPENGL := true BUILD_EMULATOR_OPENGL := true

View file

@ -35,8 +35,6 @@ endif
# Build OpenGLES emulation host and guest libraries # Build OpenGLES emulation host and guest libraries
BUILD_EMULATOR_OPENGL := true BUILD_EMULATOR_OPENGL := true
WPA_SUPPLICANT_VERSION := VER_0_8_X
# Build and enable the OpenGL ES View renderer. When running on the emulator, # 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. # the GLES renderer disables itself if host GL acceleration isn't available.
USE_OPENGL_RENDERER := true USE_OPENGL_RENDERER := true

View file

@ -42,8 +42,6 @@ ifeq ($(HOST_OS),linux)
endif endif
endif endif
WPA_SUPPLICANT_VERSION := VER_0_8_X
# Build OpenGLES emulation guest and host libraries # Build OpenGLES emulation guest and host libraries
BUILD_EMULATOR_OPENGL := true BUILD_EMULATOR_OPENGL := true

View file

@ -27,8 +27,6 @@ ifeq ($(HOST_OS),linux)
WITH_DEXPREOPT := true WITH_DEXPREOPT := true
endif endif
WPA_SUPPLICANT_VERSION := VER_0_8_X
# Build OpenGLES emulation host and guest libraries # Build OpenGLES emulation host and guest libraries
BUILD_EMULATOR_OPENGL := true BUILD_EMULATOR_OPENGL := true

View file

@ -27,8 +27,6 @@ ifeq ($(HOST_OS),linux)
WITH_DEXPREOPT := true WITH_DEXPREOPT := true
endif endif
WPA_SUPPLICANT_VERSION := VER_0_8_X
# Build OpenGLES emulation host and guest libraries # Build OpenGLES emulation host and guest libraries
BUILD_EMULATOR_OPENGL := true BUILD_EMULATOR_OPENGL := true

View file

@ -78,7 +78,6 @@ PRODUCT_PACKAGES += \
libutils \ libutils \
libvisualizer \ libvisualizer \
libvorbisidec \ libvorbisidec \
libwpa_client \
media \ media \
media_cmd \ media_cmd \
mediaserver \ mediaserver \

View file

@ -45,8 +45,6 @@ PRODUCT_PACKAGES := \
TeleService \ TeleService \
CalendarProvider \ CalendarProvider \
bluetooth-health \ bluetooth-health \
hostapd \
wpa_supplicant.conf \
WallpaperCropper WallpaperCropper
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
@ -57,8 +55,7 @@ PRODUCT_PACKAGES += \
network \ network \
pand \ pand \
pppd \ pppd \
sdptool \ sdptool
wpa_supplicant
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
librs_jni \ librs_jni \