diff options
author | JP Abgrall <jpa@google.com> | 2011-04-15 17:31:37 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-04-15 17:31:37 -0700 |
commit | 6e558e3f681569b74adf5bd105871c7e21ddf042 (patch) | |
tree | 895544543a1d79c632c38663fb8cf0da57fcb15f | |
parent | 99ee1408e9eeb004e8b67fbe8c21477381dc638a (diff) | |
parent | a333c919a6ff8d0e79df823a92b1638012d6ec5a (diff) | |
download | device_samsung_crespo-6e558e3f681569b74adf5bd105871c7e21ddf042.zip device_samsung_crespo-6e558e3f681569b74adf5bd105871c7e21ddf042.tar.gz device_samsung_crespo-6e558e3f681569b74adf5bd105871c7e21ddf042.tar.bz2 |
am a333c919: am 89b7f979: am 3b10d5ef: Correctly handle prebuilt kernel\'s wifi module.
* commit 'a333c919a6ff8d0e79df823a92b1638012d6ec5a':
Correctly handle prebuilt kernel's wifi module.
-rw-r--r-- | device_base.mk | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/device_base.mk b/device_base.mk index 11d8848..183d936 100644 --- a/device_base.mk +++ b/device_base.mk @@ -140,8 +140,14 @@ PRODUCT_TAGS += dalvik.gc.type-precise # Screen size is "normal", density is "hdpi" PRODUCT_AAPT_CONFIG := normal hdpi +ifeq ($(TARGET_PREBUILT_WIFI_MODULE),) +LOCAL_WIFI_MODULE := device/samsung/crespo/bcm4329.ko +else +LOCAL_WIFI_MODULE := $(TARGET_PREBUILT_WIFI_MODULE) +endif + PRODUCT_COPY_FILES += \ - device/samsung/crespo/bcm4329.ko:system/modules/bcm4329.ko + $(LOCAL_WIFI_MODULE):system/modules/bcm4329.ko ifeq ($(TARGET_PREBUILT_KERNEL),) LOCAL_KERNEL := device/samsung/crespo/kernel |