diff options
| author | Brian Swetland <swetland@google.com> | 2010-09-19 04:41:48 -0700 |
|---|---|---|
| committer | Brian Swetland <swetland@google.com> | 2010-09-19 04:41:48 -0700 |
| commit | 3e465bed88a22de33d452e5ac8524813d916275d (patch) | |
| tree | 87c082b0f57749b39879e29a597cc945ce91bd7f /bcm4329 | |
| parent | 93f2d6b2649cf423edce5b4fc5463cb4eff3ebd4 (diff) | |
| parent | fa410a88bd8b3abf6db97b6476dda0bc7f1b5e0a (diff) | |
| download | hardware_broadcom_wlan-3e465bed88a22de33d452e5ac8524813d916275d.zip hardware_broadcom_wlan-3e465bed88a22de33d452e5ac8524813d916275d.tar.gz hardware_broadcom_wlan-3e465bed88a22de33d452e5ac8524813d916275d.tar.bz2 | |
resolved conflicts for merge of fa410a88 to master
Change-Id: If3ab18205b335b0286a3b2a83c4447254379b7ec
Diffstat (limited to 'bcm4329')
| -rw-r--r-- | bcm4329/firmware/Android.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/bcm4329/firmware/Android.mk b/bcm4329/firmware/Android.mk index 465ee54..db9c3e8 100644 --- a/bcm4329/firmware/Android.mk +++ b/bcm4329/firmware/Android.mk @@ -20,7 +20,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := fw_bcm4329.bin LOCAL_MODULE_CLASS := ETC -LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/firmware +#LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/firmware +LOCAL_MODULE_PATH := $(TARGET_OUT)/vendor/firmware ifeq ($(strip $(WIFI_BAND)),802_11_ABG) LOCAL_SRC_FILES := fw_bcm4329_abg.bin else @@ -33,7 +34,8 @@ include $(BUILD_PREBUILT) include $(CLEAR_VARS) LOCAL_MODULE := fw_bcm4329_apsta.bin LOCAL_MODULE_CLASS := ETC -LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/firmware +#LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/firmware +LOCAL_MODULE_PATH := $(TARGET_OUT)/vendor/firmware LOCAL_SRC_FILES := $(LOCAL_MODULE) include $(BUILD_PREBUILT) |