Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef364228 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "emulator: update fstab.ranchu installation for arm images"

parents df2a2179 acc16846

target/product/aosp_arm.mk

+1 −2
Original line number Original line Diff line number Diff line
@@ -23,8 +23,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ 
PRODUCT_COPY_FILES += \

PRODUCT_COPY_FILES += \

    development/sys-img/advancedFeatures.ini.arm:advancedFeatures.ini \

    development/sys-img/advancedFeatures.ini.arm:advancedFeatures.ini \

    prebuilts/qemu-kernel/arm/3.18/kernel-qemu2:kernel-ranchu \

    prebuilts/qemu-kernel/arm/3.18/kernel-qemu2:kernel-ranchu \

    device/generic/goldfish/fstab.ranchu.arm:root/fstab.ranchu \

    device/generic/goldfish/fstab.ranchu.arm:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.ranchu

    device/generic/goldfish/fstab.ranchu.early.arm:root/fstab.ranchu.early





include $(SRC_TARGET_DIR)/product/full.mk

include $(SRC_TARGET_DIR)/product/full.mk

target/product/aosp_arm64.mk

+1 −2
Original line number Original line Diff line number Diff line
@@ -28,8 +28,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ 
PRODUCT_COPY_FILES += \

PRODUCT_COPY_FILES += \

    development/sys-img/advancedFeatures.ini.arm:advancedFeatures.ini \

    development/sys-img/advancedFeatures.ini.arm:advancedFeatures.ini \

    prebuilts/qemu-kernel/arm64/3.18/kernel-qemu2:kernel-ranchu \

    prebuilts/qemu-kernel/arm64/3.18/kernel-qemu2:kernel-ranchu \

    device/generic/goldfish/fstab.ranchu.arm:root/fstab.ranchu \

    device/generic/goldfish/fstab.ranchu.arm:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.ranchu

    device/generic/goldfish/fstab.ranchu.early.arm:root/fstab.ranchu.early





$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)

target/product/sdk_phone_arm64.mk

+1 −2
Original line number Original line Diff line number Diff line
@@ -28,8 +28,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ 
PRODUCT_COPY_FILES += \

PRODUCT_COPY_FILES += \

    development/sys-img/advancedFeatures.ini.arm:advancedFeatures.ini \

    development/sys-img/advancedFeatures.ini.arm:advancedFeatures.ini \

    prebuilts/qemu-kernel/arm64/3.18/kernel-qemu2:kernel-ranchu \

    prebuilts/qemu-kernel/arm64/3.18/kernel-qemu2:kernel-ranchu \

    device/generic/goldfish/fstab.ranchu.arm:root/fstab.ranchu \

    device/generic/goldfish/fstab.ranchu.arm:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.ranchu

    device/generic/goldfish/fstab.ranchu.early.arm:root/fstab.ranchu.early





$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/product/sdk_base.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/product/sdk_base.mk)

target/product/sdk_phone_armv7.mk

+1 −2
Original line number Original line Diff line number Diff line
@@ -23,8 +23,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ 
PRODUCT_COPY_FILES += \

PRODUCT_COPY_FILES += \

    development/sys-img/advancedFeatures.ini.arm:advancedFeatures.ini \

    development/sys-img/advancedFeatures.ini.arm:advancedFeatures.ini \

    prebuilts/qemu-kernel/arm/3.18/kernel-qemu2:kernel-ranchu \

    prebuilts/qemu-kernel/arm/3.18/kernel-qemu2:kernel-ranchu \

    device/generic/goldfish/fstab.ranchu.arm:root/fstab.ranchu \

    device/generic/goldfish/fstab.ranchu.arm:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.ranchu

    device/generic/goldfish/fstab.ranchu.early.arm:root/fstab.ranchu.early





$(call inherit-product, $(SRC_TARGET_DIR)/product/sdk_base.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/product/sdk_base.mk)