1 files changed, 29 insertions, 2 deletions

diff --git a/Android.mk b/Android.mk
index 96a5cf3..1f38990 100644
--- a/Android.mk
+++ b/Android.mk
@@ -4,8 +4,6 @@ img-sgx.untarred_timestamp := $(img-sgx.untarred_intermediates)/stamp
 img-sgx.untarred_bin := $(img-sgx.untarred_intermediates)/sgx
 img-sgx.tar := $(LOCAL_PATH)/$(TARGET_BOARD_PLATFORM)/sgx.tgz
 
-$(hide $(shell $(LOCAL_PATH)/untar.sh $(LOCAL_PATH)/wl12xx wpan $(LOCAL_PATH)/wl12xx/wpan.tgz))
-
 include $(call all-subdir-makefiles)
 
 $(img-sgx.untarred_timestamp) : $(img-sgx.tar)
@@ -173,3 +171,32 @@ $(LOCAL_BUILT_MODULE) : $(wl12xx-wlan.untarred_timestamp) | $(ACP)
 endif
 
 ################################################################################
+# Install WPAN firmware files
+###############################################################################
+WPAN_TGZ := device/ti/proprietary-open/wl12xx/wpan.tgz
+
+ifneq ($(WPAN_TGZ),)
+include $(CLEAR_VARS)
+
+wpan.untarred_intermediates := $(call intermediates-dir-for, FAKE, wpan.untarred)
+wpan.untarred_timestamp := $(wpan.untarred_intermediates)/stamp
+
+WPAN_FW_LOCAL_PATH:= device/ti/proprietary-open/wl12xx/
+LOCAL_MODULE := ti-wpan-fw
+LOCAL_MODULE_CLASS := FAKE
+LOCAL_MODULE_TAGS := optional
+
+include $(BUILD_SYSTEM)/base_rules.mk
+
+$(LOCAL_BUILT_MODULE) : $(WPAN_TGZ)
+        echo "Unzip $(wpan.untarred_intermediates) <- $<"
+        $(hide) rm -rvf $(wpan.untarred_intermediates)/wpan
+        $(hide) mkdir -p $(wpan.untarred_intermediates)
+        $(hide) tar -C $(wpan.untarred_intermediates) -zvxf $<
+        $(hide) touch $(wpan.untarred_intermediates)
+
+$(LOCAL_INSTALLED_MODULE) : $(LOCAL_BUILT_MODULE) | $(ACP)
+        @echo "Copying wpan firmware ..."
+        @mkdir -p $(PRODUCT_OUT)/system/etc/firmware
+        $(hide) $(ACP) -rfpv $(wpan.untarred_intermediates)/wpan/*/*.bts $(PRODUCT_OUT)/system/etc/firmware/
+endif