Updated output directories to support vendor partition.
Daniel Rosenberg [Tue, 10 Jun 2014 00:58:59 +0000 (17:58 -0700)]
Switched target location to use TARGET_COPY_OUT_VENDOR

Change-Id: I2e09a5fb2df10174d948eb32fccf07dfec991a60
Signed-off-by: Daniel Rosenberg <drosen@google.com>

bcmdhd/firmware/bcm4324/device-bcm.mk
bcmdhd/firmware/bcm4329/device-bcm.mk
bcmdhd/firmware/bcm4330/device-bcm.mk
bcmdhd/firmware/bcm4335/device-bcm.mk
bcmdhd/firmware/bcm4339/device-bcm.mk
bcmdhd/firmware/bcm4350/device-bcm.mk
bcmdhd/firmware/bcm4354/device-bcm.mk
bcmdhd/firmware/bcm4356/device-bcm.mk

index 5100441..5fdd323 100644 (file)
@@ -21,6 +21,6 @@ BCM_FW_SRC_FILE_STA := fw_bcm4324.bin
 BCM_FW_SRC_FILE_AP  := fw_bcm4324.bin
 
 PRODUCT_COPY_FILES += \
-    hardware/broadcom/wlan/bcmdhd/firmware/bcm4324/$(BCM_FW_SRC_FILE_STA):system/vendor/firmware/fw_bcmdhd.bin \
-    hardware/broadcom/wlan/bcmdhd/firmware/bcm4324/$(BCM_FW_SRC_FILE_AP):system/vendor/firmware/fw_bcmdhd_apsta.bin
+    hardware/broadcom/wlan/bcmdhd/firmware/bcm4324/$(BCM_FW_SRC_FILE_STA):$(TARGET_COPY_OUT_VENDOR)/firmware/fw_bcmdhd.bin \
+    hardware/broadcom/wlan/bcmdhd/firmware/bcm4324/$(BCM_FW_SRC_FILE_AP):$(TARGET_COPY_OUT_VENDOR)/firmware/fw_bcmdhd_apsta.bin
 ########################
index ef42698..aaef789 100644 (file)
@@ -25,6 +25,6 @@ endif
 BCM_FW_SRC_FILE_AP  := fw_bcm4329_apsta.bin
 
 PRODUCT_COPY_FILES += \
-    hardware/broadcom/wlan/bcmdhd/firmware/bcm4329/$(BCM_FW_SRC_FILE_STA):system/vendor/firmware/fw_bcmdhd.bin \
-    hardware/broadcom/wlan/bcmdhd/firmware/bcm4329/$(BCM_FW_SRC_FILE_AP):system/vendor/firmware/fw_bcmdhd_apsta.bin
+    hardware/broadcom/wlan/bcmdhd/firmware/bcm4329/$(BCM_FW_SRC_FILE_STA):$(TARGET_COPY_OUT_VENDOR)/firmware/fw_bcmdhd.bin \
+    hardware/broadcom/wlan/bcmdhd/firmware/bcm4329/$(BCM_FW_SRC_FILE_AP):$(TARGET_COPY_OUT_VENDOR)/firmware/fw_bcmdhd_apsta.bin
 ########################
index d9acd67..b008d44 100644 (file)
@@ -26,6 +26,6 @@ BCM_FW_SRC_FILE_AP  := fw_bcm4330_apsta_bg.bin
 endif
 
 PRODUCT_COPY_FILES += \
-    hardware/broadcom/wlan/bcmdhd/firmware/bcm4330/$(BCM_FW_SRC_FILE_STA):system/vendor/firmware/fw_bcmdhd.bin \
-    hardware/broadcom/wlan/bcmdhd/firmware/bcm4330/$(BCM_FW_SRC_FILE_AP):system/vendor/firmware/fw_bcmdhd_apsta.bin
+    hardware/broadcom/wlan/bcmdhd/firmware/bcm4330/$(BCM_FW_SRC_FILE_STA):$(TARGET_COPY_OUT_VENDOR)/firmware/fw_bcmdhd.bin \
+    hardware/broadcom/wlan/bcmdhd/firmware/bcm4330/$(BCM_FW_SRC_FILE_AP):$(TARGET_COPY_OUT_VENDOR)/firmware/fw_bcmdhd_apsta.bin
 ########################
index 1ebce12..6c12721 100644 (file)
@@ -18,5 +18,5 @@ BCM_FW_SRC_FILE_STA := fw_bcmdhd.bin
 BCM_FW_SRC_FILE_AP  := fw_bcmdhd_ap.bin
 
 PRODUCT_COPY_FILES += \
-    hardware/broadcom/wlan/bcmdhd/firmware/bcm4335/$(BCM_FW_SRC_FILE_STA):system/vendor/firmware/fw_bcmdhd.bin \
-    hardware/broadcom/wlan/bcmdhd/firmware/bcm4335/$(BCM_FW_SRC_FILE_AP):system/vendor/firmware/fw_bcmdhd_ap.bin
+    hardware/broadcom/wlan/bcmdhd/firmware/bcm4335/$(BCM_FW_SRC_FILE_STA):$(TARGET_COPY_OUT_VENDOR)/firmware/fw_bcmdhd.bin \
+    hardware/broadcom/wlan/bcmdhd/firmware/bcm4335/$(BCM_FW_SRC_FILE_AP):$(TARGET_COPY_OUT_VENDOR)/firmware/fw_bcmdhd_ap.bin
index 76604e1..981f227 100644 (file)
@@ -18,5 +18,5 @@ BCM_FW_SRC_FILE_STA := fw_bcmdhd.bin
 BCM_FW_SRC_FILE_AP  := fw_bcmdhd_apsta.bin
 
 PRODUCT_COPY_FILES += \
-    hardware/broadcom/wlan/bcmdhd/firmware/bcm4339/$(BCM_FW_SRC_FILE_STA):system/vendor/firmware/fw_bcmdhd.bin \
-    hardware/broadcom/wlan/bcmdhd/firmware/bcm4339/$(BCM_FW_SRC_FILE_AP):system/vendor/firmware/fw_bcmdhd_apsta.bin
+    hardware/broadcom/wlan/bcmdhd/firmware/bcm4339/$(BCM_FW_SRC_FILE_STA):$(TARGET_COPY_OUT_VENDOR)/firmware/fw_bcmdhd.bin \
+    hardware/broadcom/wlan/bcmdhd/firmware/bcm4339/$(BCM_FW_SRC_FILE_AP):$(TARGET_COPY_OUT_VENDOR)/firmware/fw_bcmdhd_apsta.bin
index 3631646..2224b36 100644 (file)
@@ -21,6 +21,6 @@ BCM_FW_SRC_FILE_STA := fw_bcm4350.bin
 BCM_FW_SRC_FILE_AP  := fw_bcm4350.bin
 
 PRODUCT_COPY_FILES += \
-    hardware/broadcom/wlan/bcmdhd/firmware/bcm4350/$(BCM_FW_SRC_FILE_STA):system/vendor/firmware/fw_bcmdhd.bin \
-    hardware/broadcom/wlan/bcmdhd/firmware/bcm4350/$(BCM_FW_SRC_FILE_AP):system/vendor/firmware/fw_bcmdhd_apsta.bin
+    hardware/broadcom/wlan/bcmdhd/firmware/bcm4350/$(BCM_FW_SRC_FILE_STA):$(TARGET_COPY_OUT_VENDOR)/firmware/fw_bcmdhd.bin \
+    hardware/broadcom/wlan/bcmdhd/firmware/bcm4350/$(BCM_FW_SRC_FILE_AP):$(TARGET_COPY_OUT_VENDOR)/firmware/fw_bcmdhd_apsta.bin
 ########################
index 2a1e7ca..0b8c54c 100644 (file)
@@ -21,6 +21,6 @@ BCM_FW_SRC_FILE_STA := fw_bcm4354.bin
 BCM_FW_SRC_FILE_AP  := fw_bcm4354_ap.bin
 
 PRODUCT_COPY_FILES += \
-    hardware/broadcom/wlan/bcmdhd/firmware/bcm4354/$(BCM_FW_SRC_FILE_STA):system/vendor/firmware/fw_bcmdhd.bin \
-    hardware/broadcom/wlan/bcmdhd/firmware/bcm4354/$(BCM_FW_SRC_FILE_AP):system/vendor/firmware/fw_bcmdhd_apsta.bin
+    hardware/broadcom/wlan/bcmdhd/firmware/bcm4354/$(BCM_FW_SRC_FILE_STA):$(TARGET_COPY_OUT_VENDOR)/firmware/fw_bcmdhd.bin \
+    hardware/broadcom/wlan/bcmdhd/firmware/bcm4354/$(BCM_FW_SRC_FILE_AP):$(TARGET_COPY_OUT_VENDOR)/firmware/fw_bcmdhd_apsta.bin
 ########################
index 43a086e..8c7ba7b 100644 (file)
@@ -26,6 +26,6 @@ BCM_FW_SRC_FILE_AP  := fw_bcm4356_ap_pcie.bin
 endif
 
 PRODUCT_COPY_FILES += \
-    hardware/broadcom/wlan/bcmdhd/firmware/bcm4356/$(BCM_FW_SRC_FILE_STA):system/vendor/firmware/fw_bcmdhd.bin \
-    hardware/broadcom/wlan/bcmdhd/firmware/bcm4356/$(BCM_FW_SRC_FILE_AP):system/vendor/firmware/fw_bcmdhd_apsta.bin
+    hardware/broadcom/wlan/bcmdhd/firmware/bcm4356/$(BCM_FW_SRC_FILE_STA):$(TARGET_COPY_OUT_VENDOR)/firmware/fw_bcmdhd.bin \
+    hardware/broadcom/wlan/bcmdhd/firmware/bcm4356/$(BCM_FW_SRC_FILE_AP):$(TARGET_COPY_OUT_VENDOR)/firmware/fw_bcmdhd_apsta.bin
 ########################