From 8c77dc852534890a237d6f8e3751e4d9d1d915f3 Mon Sep 17 00:00:00 2001 From: ggow Date: Tue, 23 Apr 2019 11:41:28 +0100 Subject: [PATCH] Flatten rootdir --- device.mk | 19 +--- rootdir/Android.mk | 116 ---------------------- rootdir/{bin => }/enableswap.sh | 0 rootdir/{etc => }/factory_init.project.rc | 0 rootdir/{etc => }/factory_init.rc | 0 rootdir/{etc => }/fstab.mt8127 | 0 rootdir/{etc => }/init.base.rc | 0 rootdir/{etc => }/init.build.rc | 0 rootdir/{etc => }/init.charging.rc | 0 rootdir/{etc => }/init.mt8127.rc | 0 rootdir/{etc => }/init.mt8127.usb.rc | 0 rootdir/{etc => }/init.project.rc | 0 rootdir/{etc => }/init.rc.ufsd | 0 rootdir/{etc => }/init.recovery.mt8127.rc | 0 rootdir/{etc => }/init.ssd.rc | 0 rootdir/{etc => }/meta_init.project.rc | 0 rootdir/{etc => }/meta_init.rc | 0 rootdir/{etc => }/ueventd.mt8127.rc | 0 18 files changed, 2 insertions(+), 133 deletions(-) delete mode 100644 rootdir/Android.mk rename rootdir/{bin => }/enableswap.sh (100%) rename rootdir/{etc => }/factory_init.project.rc (100%) rename rootdir/{etc => }/factory_init.rc (100%) rename rootdir/{etc => }/fstab.mt8127 (100%) rename rootdir/{etc => }/init.base.rc (100%) rename rootdir/{etc => }/init.build.rc (100%) rename rootdir/{etc => }/init.charging.rc (100%) rename rootdir/{etc => }/init.mt8127.rc (100%) rename rootdir/{etc => }/init.mt8127.usb.rc (100%) rename rootdir/{etc => }/init.project.rc (100%) rename rootdir/{etc => }/init.rc.ufsd (100%) rename rootdir/{etc => }/init.recovery.mt8127.rc (100%) rename rootdir/{etc => }/init.ssd.rc (100%) rename rootdir/{etc => }/meta_init.project.rc (100%) rename rootdir/{etc => }/meta_init.rc (100%) rename rootdir/{etc => }/ueventd.mt8127.rc (100%) diff --git a/device.mk b/device.mk index 4dc01fc..5c2ac83 100644 --- a/device.mk +++ b/device.mk @@ -40,23 +40,8 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.bluetooth_le.xml:system/etc/permissions/android.hardware.bluetooth_le.xml # Ramdisk -PRODUCT_PACKAGES += \ - factory_init.project.rc \ - factory_init.rc \ - fstab.mt8127 \ - init.base.rc \ - init.build.rc \ - init.charging.rc \ - init.mt8127.rc \ - init.mt8127.usb.rc \ - init.project.rc \ - init.rc.ufsd \ - init.recovery.mt8127.rc \ - init.ssd.rc \ - meta_init.project.rc \ - meta_init.rc \ - ueventd.mt8127.rc \ - enableswap.sh +PRODUCT_COPY_FILES += \ + $(call find-copy-subdir-files,*,$(LOCAL_PATH)/rootdir,root) # Config files PRODUCT_COPY_FILES += \ diff --git a/rootdir/Android.mk b/rootdir/Android.mk deleted file mode 100644 index cd26ab2..0000000 --- a/rootdir/Android.mk +++ /dev/null @@ -1,116 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -# Configuration scripts -include $(CLEAR_VARS) -LOCAL_MODULE := enableswap.sh -LOCAL_MODULE_TAGS := optional eng -LOCAL_MODULE_CLASS := ETC -LOCAL_SRC_FILES := bin/enableswap.sh -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := factory_init.project.rc -LOCAL_MODULE_TAGS := optional eng -LOCAL_MODULE_CLASS := ETC -LOCAL_SRC_FILES := etc/factory_init.project.rc -LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := factory_init.rc -LOCAL_MODULE_TAGS := optional eng -LOCAL_MODULE_CLASS := ETC -LOCAL_SRC_FILES := etc/factory_init.rc -LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) -include $(BUILD_PREBUILT) - -# Init scripts -include $(CLEAR_VARS) -LOCAL_MODULE := fstab.mt8127 -LOCAL_MODULE_TAGS := optional eng -LOCAL_MODULE_CLASS := ETC -LOCAL_SRC_FILES := etc/fstab.mt8127 -LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := init.base.rc -LOCAL_MODULE_TAGS := optional eng -LOCAL_MODULE_CLASS := ETC -LOCAL_SRC_FILES := etc/init.base.rc -LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := init.mt8127.rc -LOCAL_MODULE_TAGS := optional eng -LOCAL_MODULE_CLASS := ETC -LOCAL_SRC_FILES := etc/init.mt8127.rc -LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := init.mt8127.usb.rc -LOCAL_MODULE_TAGS := optional eng -LOCAL_MODULE_CLASS := ETC -LOCAL_SRC_FILES := etc/init.mt8127.usb.rc -LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := init.project.rc -LOCAL_MODULE_TAGS := optional eng -LOCAL_MODULE_CLASS := ETC -LOCAL_SRC_FILES := etc/init.project.rc -LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := init.rc.ufsd -LOCAL_MODULE_TAGS := optional eng -LOCAL_MODULE_CLASS := ETC -LOCAL_SRC_FILES := etc/init.rc.ufsd -LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := init.recovery.mt8127.rc -LOCAL_MODULE_TAGS := optional eng -LOCAL_MODULE_CLASS := ETC -LOCAL_SRC_FILES := etc/init.recovery.mt8127.rc -LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT) -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := init.ssd.rc -LOCAL_MODULE_TAGS := optional eng -LOCAL_MODULE_CLASS := ETC -LOCAL_SRC_FILES := etc/init.ssd.rc -LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := meta_init.project.rc -LOCAL_MODULE_TAGS := optional eng -LOCAL_MODULE_CLASS := ETC -LOCAL_SRC_FILES := etc/meta_init.project.rc -LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := meta_init.rc -LOCAL_MODULE_TAGS := optional eng -LOCAL_MODULE_CLASS := ETC -LOCAL_SRC_FILES := etc/meta_init.rc -LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := ueventd.mt8127.rc -LOCAL_MODULE_TAGS := optional eng -LOCAL_MODULE_CLASS := ETC -LOCAL_SRC_FILES := etc/ueventd.mt8127.rc -LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) -include $(BUILD_PREBUILT) - - diff --git a/rootdir/bin/enableswap.sh b/rootdir/enableswap.sh similarity index 100% rename from rootdir/bin/enableswap.sh rename to rootdir/enableswap.sh diff --git a/rootdir/etc/factory_init.project.rc b/rootdir/factory_init.project.rc similarity index 100% rename from rootdir/etc/factory_init.project.rc rename to rootdir/factory_init.project.rc diff --git a/rootdir/etc/factory_init.rc b/rootdir/factory_init.rc similarity index 100% rename from rootdir/etc/factory_init.rc rename to rootdir/factory_init.rc diff --git a/rootdir/etc/fstab.mt8127 b/rootdir/fstab.mt8127 similarity index 100% rename from rootdir/etc/fstab.mt8127 rename to rootdir/fstab.mt8127 diff --git a/rootdir/etc/init.base.rc b/rootdir/init.base.rc similarity index 100% rename from rootdir/etc/init.base.rc rename to rootdir/init.base.rc diff --git a/rootdir/etc/init.build.rc b/rootdir/init.build.rc similarity index 100% rename from rootdir/etc/init.build.rc rename to rootdir/init.build.rc diff --git a/rootdir/etc/init.charging.rc b/rootdir/init.charging.rc similarity index 100% rename from rootdir/etc/init.charging.rc rename to rootdir/init.charging.rc diff --git a/rootdir/etc/init.mt8127.rc b/rootdir/init.mt8127.rc similarity index 100% rename from rootdir/etc/init.mt8127.rc rename to rootdir/init.mt8127.rc diff --git a/rootdir/etc/init.mt8127.usb.rc b/rootdir/init.mt8127.usb.rc similarity index 100% rename from rootdir/etc/init.mt8127.usb.rc rename to rootdir/init.mt8127.usb.rc diff --git a/rootdir/etc/init.project.rc b/rootdir/init.project.rc similarity index 100% rename from rootdir/etc/init.project.rc rename to rootdir/init.project.rc diff --git a/rootdir/etc/init.rc.ufsd b/rootdir/init.rc.ufsd similarity index 100% rename from rootdir/etc/init.rc.ufsd rename to rootdir/init.rc.ufsd diff --git a/rootdir/etc/init.recovery.mt8127.rc b/rootdir/init.recovery.mt8127.rc similarity index 100% rename from rootdir/etc/init.recovery.mt8127.rc rename to rootdir/init.recovery.mt8127.rc diff --git a/rootdir/etc/init.ssd.rc b/rootdir/init.ssd.rc similarity index 100% rename from rootdir/etc/init.ssd.rc rename to rootdir/init.ssd.rc diff --git a/rootdir/etc/meta_init.project.rc b/rootdir/meta_init.project.rc similarity index 100% rename from rootdir/etc/meta_init.project.rc rename to rootdir/meta_init.project.rc diff --git a/rootdir/etc/meta_init.rc b/rootdir/meta_init.rc similarity index 100% rename from rootdir/etc/meta_init.rc rename to rootdir/meta_init.rc diff --git a/rootdir/etc/ueventd.mt8127.rc b/rootdir/ueventd.mt8127.rc similarity index 100% rename from rootdir/etc/ueventd.mt8127.rc rename to rootdir/ueventd.mt8127.rc