From 49664b3c70f515e9067e391001d093743c615328 Mon Sep 17 00:00:00 2001 From: bohu Date: Wed, 28 Mar 2018 15:39:28 -0700 Subject: [PATCH] emulator: update fstab.ranchu installation for arm images Now init.ranchu.rc picks up fstab.ranchu from vendor/etc instead of from / BUG: 77233572 Change-Id: Ifd8639ac4cb883402c90de45b15b11077a60fa5f Merged-In: Ifd8639ac4cb883402c90de45b15b11077a60fa5f (cherry picked from commit acc16846e3d7da12d91cad69757d3e6c16da8a7f) --- target/product/aosp_arm.mk | 3 +-- target/product/aosp_arm64.mk | 3 +-- target/product/sdk_phone_arm64.mk | 3 +-- target/product/sdk_phone_armv7.mk | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/target/product/aosp_arm.mk b/target/product/aosp_arm.mk index 9ed528499..820e39255 100644 --- a/target/product/aosp_arm.mk +++ b/target/product/aosp_arm.mk @@ -23,8 +23,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_COPY_FILES += \ development/sys-img/advancedFeatures.ini.arm:advancedFeatures.ini \ prebuilts/qemu-kernel/arm/3.18/kernel-qemu2:kernel-ranchu \ - device/generic/goldfish/fstab.ranchu.arm:root/fstab.ranchu \ - device/generic/goldfish/fstab.ranchu.early.arm:root/fstab.ranchu.early + device/generic/goldfish/fstab.ranchu.arm:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.ranchu include $(SRC_TARGET_DIR)/product/full.mk diff --git a/target/product/aosp_arm64.mk b/target/product/aosp_arm64.mk index 18d613bd8..123160918 100644 --- a/target/product/aosp_arm64.mk +++ b/target/product/aosp_arm64.mk @@ -28,8 +28,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_COPY_FILES += \ development/sys-img/advancedFeatures.ini.arm:advancedFeatures.ini \ prebuilts/qemu-kernel/arm64/3.18/kernel-qemu2:kernel-ranchu \ - device/generic/goldfish/fstab.ranchu.arm:root/fstab.ranchu \ - device/generic/goldfish/fstab.ranchu.early.arm:root/fstab.ranchu.early + device/generic/goldfish/fstab.ranchu.arm:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.ranchu $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk) diff --git a/target/product/sdk_phone_arm64.mk b/target/product/sdk_phone_arm64.mk index 2aa688b13..56eb8c791 100644 --- a/target/product/sdk_phone_arm64.mk +++ b/target/product/sdk_phone_arm64.mk @@ -28,8 +28,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_COPY_FILES += \ development/sys-img/advancedFeatures.ini.arm:advancedFeatures.ini \ prebuilts/qemu-kernel/arm64/3.18/kernel-qemu2:kernel-ranchu \ - device/generic/goldfish/fstab.ranchu.arm:root/fstab.ranchu \ - device/generic/goldfish/fstab.ranchu.early.arm:root/fstab.ranchu.early + device/generic/goldfish/fstab.ranchu.arm:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.ranchu $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/sdk_base.mk) diff --git a/target/product/sdk_phone_armv7.mk b/target/product/sdk_phone_armv7.mk index e99f0f5b4..09e5c756f 100644 --- a/target/product/sdk_phone_armv7.mk +++ b/target/product/sdk_phone_armv7.mk @@ -23,8 +23,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_COPY_FILES += \ development/sys-img/advancedFeatures.ini.arm:advancedFeatures.ini \ prebuilts/qemu-kernel/arm/3.18/kernel-qemu2:kernel-ranchu \ - device/generic/goldfish/fstab.ranchu.arm:root/fstab.ranchu \ - device/generic/goldfish/fstab.ranchu.early.arm:root/fstab.ranchu.early + device/generic/goldfish/fstab.ranchu.arm:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.ranchu $(call inherit-product, $(SRC_TARGET_DIR)/product/sdk_base.mk)