From e951022d5bc66ef64200e13d7efc18dc56abd9fb Mon Sep 17 00:00:00 2001 From: Petri Gynther Date: Mon, 8 Mar 2021 21:44:26 -0800 Subject: [PATCH] Remove extra copy of fstab.gs101 vendor_ramdisk.img is assembled from two directories: $(PRODUCT_OUT)/vendor_ramdisk $(PRODUCT_OUT)/recovery/root Eliminate extra copy of fstab.gs101, so that there are no duplicate files in vendor_ramdisk.img. This is a must-have for toybox cpio, which is used to extract the archive in kernel build (build/build.sh). Bug: 182309216 Test: build + inspect vendor_ramdisk.img Test: prebuilts/build-tools/path/linux-x86/cpio -id Test: verify install + boot to home + boot to recovery Change-Id: Ib7c5e9d2535e97945fb90b1e749e2bb33b75329b --- device.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/device.mk b/device.mk index 194ba720..d76b7bac 100644 --- a/device.mk +++ b/device.mk @@ -210,7 +210,6 @@ PRODUCT_COPY_FILES += \ # Fstab files PRODUCT_COPY_FILES += \ device/google/gs101/conf/fstab.gs101:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.gs101 \ - device/google/gs101/conf/fstab.gs101:$(TARGET_COPY_OUT_RECOVERY)/root/first_stage_ramdisk/fstab.gs101 \ device/google/gs101/conf/fstab.persist:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.persist \ device/google/gs101/conf/fstab.gs101:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/first_stage_ramdisk/fstab.gs101