summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorleozwang <leozwang@google.com>2016-02-24 10:53:21 -0800
committerleozwang <leozwang@google.com>2016-02-24 10:53:21 -0800
commite24b3c840684977054ec44964ed75d4248611233 (patch)
tree44e685cc468ba2f59e88084e200f987a28a0a3c2
parent24666567db35edb70b7681c58ec07829814996f1 (diff)
downloadrockchip-e24b3c840684977054ec44964ed75d4248611233.tar.gz
Remove conditional bt/wifi build.
Change-Id: Icc3edb38fc58da3b064ba56b7847018076edba10
-rw-r--r--peripheral/bluetooth/ap6212/peripheral.mk4
-rw-r--r--peripheral/wifi/ap6212/peripheral.mk3
2 files changed, 1 insertions, 6 deletions
diff --git a/peripheral/bluetooth/ap6212/peripheral.mk b/peripheral/bluetooth/ap6212/peripheral.mk
index 35b5dea..f57da02 100644
--- a/peripheral/bluetooth/ap6212/peripheral.mk
+++ b/peripheral/bluetooth/ap6212/peripheral.mk
@@ -20,12 +20,10 @@ AP6212_BT_SRC := hardware/bsp/rockchip/peripheral/bluetooth/ap6212
AP6212_BT_FW_SRC := vendor/bsp/rockchip/peripheral/bluetooth/ap6212_firmware
AP6212_BT_FW_DST := system/vendor/firmware
-ifneq ($(wildcard $(LOCAL_PATH)/../../../../../../$(AP6212_BT_SRC)),)
PRODUCT_COPY_FILES += \
$(AP6212_BT_FW_SRC)/bcm43438a0.hcd:$(AP6212_BT_FW_DST)/bcm43438a0.hcd \
$(AP6212_BT_SRC)/bt_vendor.conf:system/etc/bluetooth/bt_vendor.conf
-endif
-#BCM bluetooth
+# BCM bluetooth
BOARD_HAVE_BLUETOOTH_BCM := true
BOARD_CUSTOM_BT_CONFIG := $(AP6212_BT_SRC)/vnd_kylin.txt
diff --git a/peripheral/wifi/ap6212/peripheral.mk b/peripheral/wifi/ap6212/peripheral.mk
index c699a47..c0f13a0 100644
--- a/peripheral/wifi/ap6212/peripheral.mk
+++ b/peripheral/wifi/ap6212/peripheral.mk
@@ -19,10 +19,7 @@ LOCAL_PATH := $(call my-dir)
AP6212_WIFI_FW_SRC := vendor/bsp/rockchip/peripheral/wifi/ap6212_firmware
AP6212_WIFI_FW_DST = system/vendor/firmware
-# ifneq ($(wildcard /usr/local/google/home/leozwang/tmp/rk/vendor/bsp/rockchip/aaa),)
-ifneq ($(wildcard $(LOCAL_PATH)/../../../../../../$(AP6212_WIFI_FW_SRC)),)
AP6212_WIFI_FW := fw_bcm43438a0_apsta.bin fw_bcm43438a0.bin fw_bcm43438a0_p2p.bin nvram_ap6212.txt
-endif
PRODUCT_COPY_FILES += \
$(join $(patsubst %, $(AP6212_WIFI_FW_SRC)/%, $(AP6212_WIFI_FW)), $(patsubst %, :$(AP6212_WIFI_FW_DST)/%, $(AP6212_WIFI_FW)))