From 4cf3e65be76ea69cc7e04ade86e9aadd77593018 Mon Sep 17 00:00:00 2001 From: Isaac Chen Date: Wed, 21 Mar 2018 10:40:44 +0800 Subject: [PATCH] Move emulator fstab to vendor for "system as root" In P, the root of the system image is used as the root of the device, so all device (or vendor) spicific files need to be moved to vendor partition. Relevant configuration files need to be modified accordingly. Bug: 76037265 Test: m -j; emulator # booted to home screen and # checked fstab.ranchu is under vendor/etc Change-Id: I88bfdbc1d7791f6afb64edf352b4898a50b41190 --- target/product/emulator.mk | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/target/product/emulator.mk b/target/product/emulator.mk index 0f33f3860..3f7aa067c 100644 --- a/target/product/emulator.mk +++ b/target/product/emulator.mk @@ -116,10 +116,9 @@ PRODUCT_PACKAGES += \ PRODUCT_COPY_FILES += \ device/generic/goldfish/init.ranchu-core.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.ranchu-core.sh \ device/generic/goldfish/init.ranchu-net.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.ranchu-net.sh \ - device/generic/goldfish/init.ranchu.rc:root/init.ranchu.rc \ - device/generic/goldfish/fstab.ranchu:root/fstab.ranchu \ - device/generic/goldfish/fstab.ranchu.early:root/fstab.ranchu.early \ - device/generic/goldfish/ueventd.ranchu.rc:root/ueventd.ranchu.rc \ + device/generic/goldfish/init.ranchu.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.ranchu.rc \ + device/generic/goldfish/fstab.ranchu:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.ranchu \ + device/generic/goldfish/ueventd.ranchu.rc:$(TARGET_COPY_OUT_VENDOR)/ueventd.rc \ device/generic/goldfish/input/goldfish_rotary.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/goldfish_rotary.idc \ device/generic/goldfish/manifest.xml:$(TARGET_COPY_OUT_VENDOR)/manifest.xml \ device/generic/goldfish/data/etc/permissions/privapp-permissions-goldfish.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/privapp-permissions-goldfish.xml \