From 9ddd72ae4edfc981adca14c1e072e53c4f75f8f8 Mon Sep 17 00:00:00 2001 From: Jaap Jan Meijer Date: Tue, 11 Oct 2016 19:56:01 +0200 Subject: [PATCH] Update PRODUCT_COPY_FILES to match default androidboot.hardware androidboot.hardware is set by default to TARGET_PRODUCT this is not the same as PRODUCT_RELEASE_NAME used in PRODUCT_COPY_FILES --- device.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/device.mk b/device.mk index 0ee8ba1..eb14654 100644 --- a/device.mk +++ b/device.mk @@ -31,11 +31,11 @@ PRODUCT_COPY_FILES := \ $(if $(wildcard $(PRODUCT_DIR)init.rc),$(PRODUCT_DIR)init.rc:root/init.rc) \ $(if $(wildcard $(PRODUCT_DIR)init.sh),$(PRODUCT_DIR),$(LOCAL_PATH)/)init.sh:system/etc/init.sh \ $(if $(wildcard $(PRODUCT_DIR)modules.blacklist),$(PRODUCT_DIR),$(LOCAL_PATH)/)modules.blacklist:system/etc/modules.blacklist \ - $(if $(wildcard $(PRODUCT_DIR)fstab.$(PRODUCT_RELEASE_NAME)),$(PRODUCT_DIR)fstab.$(PRODUCT_RELEASE_NAME),$(LOCAL_PATH)/fstab.x86):root/fstab.$(PRODUCT_RELEASE_NAME) \ + $(if $(wildcard $(PRODUCT_DIR)fstab.$(TARGET_PRODUCT)),$(PRODUCT_DIR)fstab.$(TARGET_PRODUCT),$(LOCAL_PATH)/fstab.x86):root/fstab.$(TARGET_PRODUCT) \ $(if $(wildcard $(PRODUCT_DIR)wpa_supplicant.conf),$(PRODUCT_DIR),$(LOCAL_PATH)/)wpa_supplicant.conf:system/etc/wifi/wpa_supplicant.conf \ $(if $(wildcard $(PRODUCT_DIR)excluded-input-devices.xml),$(PRODUCT_DIR),$(LOCAL_PATH)/)excluded-input-devices.xml:system/etc/excluded-input-devices.xml \ - $(if $(wildcard $(PRODUCT_DIR)init.$(PRODUCT_RELEASE_NAME).rc),$(PRODUCT_DIR)init.$(PRODUCT_RELEASE_NAME).rc,$(LOCAL_PATH)/init.x86.rc):root/init.$(PRODUCT_RELEASE_NAME).rc \ - $(if $(wildcard $(PRODUCT_DIR)ueventd.$(PRODUCT_RELEASE_NAME).rc),$(PRODUCT_DIR)ueventd.$(PRODUCT_RELEASE_NAME).rc,$(LOCAL_PATH)/ueventd.x86.rc):root/ueventd.$(PRODUCT_RELEASE_NAME).rc \ + $(if $(wildcard $(PRODUCT_DIR)init.$(TARGET_PRODUCT).rc),$(PRODUCT_DIR)init.$(TARGET_PRODUCT).rc,$(LOCAL_PATH)/init.x86.rc):root/init.$(TARGET_PRODUCT).rc \ + $(if $(wildcard $(PRODUCT_DIR)ueventd.$(TARGET_PRODUCT).rc),$(PRODUCT_DIR)ueventd.$(TARGET_PRODUCT).rc,$(LOCAL_PATH)/ueventd.x86.rc):root/ueventd.$(TARGET_PRODUCT).rc \ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/ppp/ip-up:system/etc/ppp/ip-up \ -- 2.11.0