From: Chih-Wei Huang <cwhuang@linux.org.tw>
Date: Thu, 5 May 2016 18:20:06 +0000 (+0800)
Subject: Change the default firmware dir
X-Git-Tag: android-x86-6.0-r1~38
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fdevice-generic-common.git;a=commitdiff_plain;h=994f665dbe546c586b711bd55ffec048aec2cff1;hp=257ca71f7510a60c04d39641ca7eba2cbc4b3b46

Change the default firmware dir
---

diff --git a/device.mk b/device.mk
index 559a3cb..bb3c1e0 100644
--- a/device.mk
+++ b/device.mk
@@ -80,7 +80,7 @@ PRODUCT_AAPT_PREF_CONFIG := mdpi
 DEVICE_PACKAGE_OVERLAYS := $(LOCAL_PATH)/overlay
 
 # Get the firmwares
-$(call inherit-product,$(LOCAL_PATH)/firmware.mk)
+$(call inherit-product,device/generic/firmware/firmware.mk)
 
 # Get the touchscreen calibration tool
 $(call inherit-product-if-exists,external/tslib/tslib.mk)
diff --git a/firmware.mk b/firmware.mk
deleted file mode 100644
index 37b38eb..0000000
--- a/firmware.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# Copyright (C) 2012 The Android-x86 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
-#
-
-LOCAL_FIRMWARES_DIR ?= /lib/firmware
-LOCAL_FIRMWARES ?= $(filter-out %.mk,$(subst $(LOCAL_FIRMWARES_DIR)/,,$(shell find $(LOCAL_FIRMWARES_DIR) -type f)))
-
-PRODUCT_COPY_FILES := \
-    $(foreach f,$(LOCAL_FIRMWARES),$(LOCAL_FIRMWARES_DIR)/$(f):system/lib/firmware/$(f))