From 3b50159ce0dd54964aef07204ee5a8391c0f5337 Mon Sep 17 00:00:00 2001
From: Max Weffers <rcstar6696@gmail.com>
Date: Thu, 6 Dec 2018 20:20:22 +0100
Subject: [PATCH] clover: import init.device.rc instead of the prop import

---
 device.mk                                      |  2 +-
 rootdir/Android.mk                             | 12 ++++++++++--
 rootdir/etc/{init.clover.rc => init.device.rc} |  0
 3 files changed, 11 insertions(+), 3 deletions(-)
 rename rootdir/etc/{init.clover.rc => init.device.rc} (100%)

diff --git a/device.mk b/device.mk
index adbf744..0ccc79b 100644
--- a/device.mk
+++ b/device.mk
@@ -83,7 +83,7 @@ PRODUCT_COPY_FILES += \
 
 # Ramdisk
 PRODUCT_PACKAGES += \
-    init.clover.rc \
+    init.device.rc \
     init.macaddress_setup.sh
 
 # Screen density
diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index 49994c2..d538ad9 100644
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -1,9 +1,17 @@
 LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE       := init.clover.rc
+LOCAL_MODULE       := init.device.rc
 LOCAL_MODULE_TAGS  := optional eng
 LOCAL_MODULE_CLASS := ETC
-LOCAL_SRC_FILES    := etc/init.clover.rc
+LOCAL_SRC_FILES    := etc/init.device.rc
 LOCAL_MODULE_PATH  := $(TARGET_OUT_VENDOR_ETC)/init/hw
 include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE       := init.macaddress_setup.sh
+LOCAL_MODULE_TAGS  := optional eng
+LOCAL_MODULE_CLASS := ETC
+LOCAL_SRC_FILES    := bin/init.macaddress_setup.sh
+LOCAL_MODULE_PATH  := $(TARGET_OUT_VENDOR_EXECUTABLES)
+include $(BUILD_PREBUILT)
diff --git a/rootdir/etc/init.clover.rc b/rootdir/etc/init.device.rc
similarity index 100%
rename from rootdir/etc/init.clover.rc
rename to rootdir/etc/init.device.rc