firmware: fix build failure

This is based on failure reported by Sumit:
device/linaro/dragonboard/db820c/firmware/ath10k/Android.mk: warning: QCA6174/hw3.0/board-2.bin: Module name contains a /, use LOCAL_MODULE_STEM and LOCAL_MODULE_RELATIVE_PATH instead 
device/linaro/dragonboard/db820c/firmware/ath10k/Android.mk: error: QCA6174/hw3.0/board-2.bin: Invalid characters in module name: // 
 build/make/core/base_rules.mk:34: error: done.

Change-Id: Iae876c24f8a4753eaaab9eaa19dd29c6495ad3dd
Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>

3 files changed, 80 insertions, 24 deletions

diff --git a/db820c/firmware/ath10k/Android.mk b/db820c/firmware/ath10k/Android.mk
index 25158fb..1648f44 100644
--- a/db820c/firmware/ath10k/Android.mk
+++ b/db820c/firmware/ath10k/Android.mk
@@ -1,27 +1,28 @@
-LOCAL_PATH := $(call my-dir)
+#
+# Copyright (C) 2015 The Android Open-Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# WARNING: Everything listed here will be built on ALL platforms,
+# including x86, the emulator, and the SDK.  Modules must be uniquely
+# named (liblights.panda), and must build everywhere, or limit themselves
+# to only building on ARM if they include assembly. Individual makefiles
+# are responsible for having their own logic, for fine-grained control.
 
-# $(1): The source file name in LOCAL_PATH.
-#       It also serves as the module name and the dest file name.
-# $(2): Module installation path.
-define add-qcom-firmware
-$(eval include $(CLEAR_VARS))\
-$(eval LOCAL_MODULE := $(1))\
-$(eval LOCAL_SRC_FILES := $(1))\
-$(eval LOCAL_MODULE_STEM := $(1))\
-$(eval LOCAL_MODULE_CLASS := FIRMWARE)\
-$(eval LOCAL_MODULE_TAGS := optional)\
-$(eval LOCAL_MODULE_PATH := $(2))\
-$(eval include $(BUILD_PREBUILT))
-endef
+LOCAL_PATH := $(call my-dir)
 
-# Ath10k Qca6174 firmware files copied from
-# https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/tree/ath10k/
-firmware_files_wifi :=  \
-    QCA6174/hw3.0/board-2.bin \
-    QCA6174/hw3.0/board.bin \
-    QCA6174/hw3.0/firmware-4.bin \
-    QCA6174/hw3.0/firmware-6.bin \
-    QCA6174/hw3.0/notice_ath10k_firmware-4.txt \
-    QCA6174/hw3.0/notice_ath10k_firmware-6.txt
+# if some modules are built directly from this directory (not subdirectories),
+# their rules should be written here.
 
-$(foreach f, $(firmware_files_wifi), $(call add-qcom-firmware, $(f), $(TARGET_OUT_VENDOR)/firmware/ath10k))
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/db820c/firmware/ath10k/QCA6174/Android.mk b/db820c/firmware/ath10k/QCA6174/Android.mk
new file mode 100644
index 0000000..1648f44
--- /dev/null
+++ b/db820c/firmware/ath10k/QCA6174/Android.mk
@@ -0,0 +1,28 @@
+#
+# Copyright (C) 2015 The Android Open-Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# WARNING: Everything listed here will be built on ALL platforms,
+# including x86, the emulator, and the SDK.  Modules must be uniquely
+# named (liblights.panda), and must build everywhere, or limit themselves
+# to only building on ARM if they include assembly. Individual makefiles
+# are responsible for having their own logic, for fine-grained control.
+
+LOCAL_PATH := $(call my-dir)
+
+# if some modules are built directly from this directory (not subdirectories),
+# their rules should be written here.
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/db820c/firmware/ath10k/QCA6174/hw3.0/Android.mk b/db820c/firmware/ath10k/QCA6174/hw3.0/Android.mk
new file mode 100644
index 0000000..75d56c1
--- /dev/null
+++ b/db820c/firmware/ath10k/QCA6174/hw3.0/Android.mk
@@ -0,0 +1,27 @@
+LOCAL_PATH := $(call my-dir)
+
+# $(1): The source file name in LOCAL_PATH.
+#       It also serves as the module name and the dest file name.
+# $(2): Module installation path.
+define add-qcom-firmware
+$(eval include $(CLEAR_VARS))\
+$(eval LOCAL_MODULE := $(1))\
+$(eval LOCAL_SRC_FILES := $(1))\
+$(eval LOCAL_MODULE_STEM := $(1))\
+$(eval LOCAL_MODULE_CLASS := FIRMWARE)\
+$(eval LOCAL_MODULE_TAGS := optional)\
+$(eval LOCAL_MODULE_PATH := $(2))\
+$(eval include $(BUILD_PREBUILT))
+endef
+
+# Ath10k Qca6174 firmware files copied from
+# https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/tree/ath10k/
+firmware_files_wifi :=  \
+    gboard-2.bin \
+    gboard.bin \
+    gfirmware-4.bin \
+    gfirmware-6.bin \
+    gnotice_ath10k_firmware-4.txt \
+    gnotice_ath10k_firmware-6.txt
+
+$(foreach f, $(firmware_files_wifi), $(call add-qcom-firmware, $(f), $(TARGET_OUT_VENDOR)/firmware/ath10k/QCA6174/hw3.0))