summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Cherry <tomcherry@google.com>2019-11-04 10:42:38 -0800
committerTom Cherry <tomcherry@google.com>2019-11-07 10:53:08 -0800
commite5a7338d8b3a1b05a45f7178b545605e72af29ae (patch)
tree59142fbe8ad6b00a27f29d6ea873e1e1e02229cf
parentf226071294e7538596356e2e0a44f374a72ed159 (diff)
downloadqemu-e5a7338d8b3a1b05a45f7178b545605e72af29ae.tar.gz
Move init and ueventd scripts from / to /system/etc
There is no reason for these scripts to continue to exist in /, when they are better suited for /system/etc. There are problems keeping them at / as well, particularly that they cannot be updated with overlayfs. Bug: 131087886 Bug: 140313207 Test: build/boot Merged-In: I036862c66fcd83a0f147f9e0744d1b9e24c7be19 Change-Id: I036862c66fcd83a0f147f9e0744d1b9e24c7be19
-rw-r--r--qemu_base.mk8
1 files changed, 3 insertions, 5 deletions
diff --git a/qemu_base.mk b/qemu_base.mk
index 4613d80..9bf82b7 100644
--- a/qemu_base.mk
+++ b/qemu_base.mk
@@ -48,7 +48,6 @@ PRODUCT_PACKAGES += \
healthd \
init \
init.environ.rc \
- init.rc \
libbinder \
libc \
libctest \
@@ -93,9 +92,8 @@ PRODUCT_PACKAGES += \
# mac_permissions.xml \
PRODUCT_COPY_FILES += \
- system/core/rootdir/init.usb.rc:root/init.usb.rc \
- system/core/rootdir/init.usb.configfs.rc:root/init.usb.configfs.rc \
- system/core/rootdir/ueventd.rc:root/ueventd.rc \
+ system/core/rootdir/init.usb.rc:system/etc/init/hw/init.usb.rc \
+ system/core/rootdir/init.usb.configfs.rc:system/etc/init/hw/init.usb.configfs.rc \
system/core/rootdir/etc/hosts:system/etc/hosts \
PRODUCT_FULL_TREBLE_OVERRIDE := true
@@ -126,7 +124,7 @@ PRODUCT_DEXPREOPT_SPEED_APPS := \
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
ro.zygote=zygote32
PRODUCT_COPY_FILES += \
- system/core/rootdir/init.zygote32.rc:root/init.zygote32.rc
+ system/core/rootdir/init.zygote32.rc:system/etc/init/hw/init.zygote32.rc
PRODUCT_PROPERTY_OVERRIDES += \
ro.carrier=unknown