From d46bbaf87b8c51227f4ac12c9d4de7662919e773 Mon Sep 17 00:00:00 2001 From: Kelly Date: Thu, 29 Oct 2020 09:08:16 -0700 Subject: [PATCH 1/2] Update device.mk Fix merge issue --- device.mk | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/device.mk b/device.mk index e47e993..a1e2e28 100644 --- a/device.mk +++ b/device.mk @@ -44,12 +44,7 @@ PRODUCT_COPY_FILES += \ # Init PRODUCT_COPY_FILES += \ -<<<<<<< HEAD - $(DEVICE_PATH)/rootdir/etc/fstab.judyln:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.judyln \ - $(DEVICE_PATH)/rootdir/etc/ueventd.judyln.rc:$(TARGET_COPY_OUT_VENDOR)/ueventd.rc -======= - $(DEVICE_PATH)/rootdir/etc/fstab.judypn:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.judypn ->>>>>>> 8cb3328... judypn: rootdir: update to 10 + $(DEVICE_PATH)/rootdir/etc/fstab.judyln:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.judyln $(foreach f,$(wildcard $(DEVICE_PATH)/rootdir/etc/init/hw/*.rc),\ $(eval PRODUCT_COPY_FILES += $(f):$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/$(notdir $f))) From 0848b76c8f6269932e6f350424e074e57ee1d8cd Mon Sep 17 00:00:00 2001 From: Kasual Date: Sun, 1 Nov 2020 09:34:04 -0800 Subject: [PATCH 2/2] Rename recovery to judyln Rename init.recovery.judypn.rc to init.recovery.judyln.rc --- .../root/{init.recovery.judypn.rc => init.recovery.judyln.rc} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename recovery/root/{init.recovery.judypn.rc => init.recovery.judyln.rc} (100%) diff --git a/recovery/root/init.recovery.judypn.rc b/recovery/root/init.recovery.judyln.rc similarity index 100% rename from recovery/root/init.recovery.judypn.rc rename to recovery/root/init.recovery.judyln.rc