Rename CF fstabs

One other board is using a PRODUCT_COPY_FILES rule for fstab.ext4. Even
though it doesn't seem to use it, it conflicts with generated files
files in soong which are global, due to a limitation with how PRODUCT_COPY_FILES are namespaced. Work around this unfortunate problem
by renaming the cuttlefish generated files.

Bug: 250457174
Bug: 285204672
Merged-In: I5fbb9288433e6a5aece4fd08cc4ecf708059cad9
Change-Id: I5fbb9288433e6a5aece4fd08cc4ecf708059cad9

5 files changed, 16 insertions, 18 deletions

diff --git a/Android.mk b/Android.mk
index 78b607fef..6d30ea82c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -27,8 +27,8 @@ $(eval $(call declare-copy-files-license-metadata,device/google/cuttlefish,wpa_s
 $(eval $(call declare-copy-files-license-metadata,device/google/cuttlefish,wpa_supplicant.rc,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
 $(eval $(call declare-copy-files-license-metadata,device/google/cuttlefish,init.cutf_cvm.rc,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
 $(eval $(call declare-copy-files-license-metadata,device/google/cuttlefish,bt_vhci_forwarder.rc,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
-$(eval $(call declare-copy-files-license-metadata,device/google/cuttlefish,fstab.f2fs,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
-$(eval $(call declare-copy-files-license-metadata,device/google/cuttlefish,fstab.ext4,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
+$(eval $(call declare-copy-files-license-metadata,device/google/cuttlefish,fstab.cf.f2fs,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
+$(eval $(call declare-copy-files-license-metadata,device/google/cuttlefish,fstab.cf.ext4,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
 $(eval $(call declare-copy-files-license-metadata,device/google/cuttlefish,init.rc,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
 $(eval $(call declare-copy-files-license-metadata,device/google/cuttlefish,audio_policy.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
 
diff --git a/host/libs/config/bootconfig_args.cpp b/host/libs/config/bootconfig_args.cpp
index 00673f638..9451514f2 100644
--- a/host/libs/config/bootconfig_args.cpp
+++ b/host/libs/config/bootconfig_args.cpp
@@ -154,7 +154,7 @@ std::vector<std::string> BootconfigArgsFromConfig(
                                      instance.modem_simulator_ports()));
   }
 
-  bootconfig_args.push_back(concat("androidboot.fstab_suffix=",
+  bootconfig_args.push_back(concat("androidboot.fstab_suffix=cf.",
                                    config.userdata_format()));
 
   bootconfig_args.push_back(
diff --git a/shared/BoardConfig.mk b/shared/BoardConfig.mk
index befb8e48f..a9d83632a 100644
--- a/shared/BoardConfig.mk
+++ b/shared/BoardConfig.mk
@@ -206,7 +206,7 @@ DHCPCD_USE_SCRIPT := yes
 
 TARGET_RECOVERY_PIXEL_FORMAT := ABGR_8888
 TARGET_RECOVERY_UI_LIB := librecovery_ui_cuttlefish
-TARGET_RECOVERY_FSTAB_GENRULE := gen_cf_fstab_f2fs
+TARGET_RECOVERY_FSTAB_GENRULE := gen_fstab_cf_f2fs
 
 BOARD_SUPER_PARTITION_SIZE := 7516192768  # 7GiB
 BOARD_SUPER_PARTITION_GROUPS := google_system_dynamic_partitions google_vendor_dynamic_partitions
diff --git a/shared/config/Android.bp b/shared/config/Android.bp
index 0a7f6185d..8954fd6ff 100644
--- a/shared/config/Android.bp
+++ b/shared/config/Android.bp
@@ -91,33 +91,31 @@ filegroup {
 }
 
 genrule {
-    name: "gen_cf_fstab_f2fs",
+    name: "gen_fstab_cf_f2fs",
     srcs: ["fstab.in"],
-    out: ["fstab.f2fs"],
+    out: ["fstab.cf.f2fs"],
     tool_files: [ "sed.f2fs" ],
     cmd: "sed -f $(location sed.f2fs) $(in) > $(out)",
 }
 
 genrule {
-    name: "gen_cf_fstab_ext4",
+    name: "gen_fstab_cf_ext4",
     srcs: ["fstab.in"],
-    out: ["fstab.ext4"],
+    out: ["fstab.cf.ext4"],
     tool_files: [ "sed.ext4" ],
     cmd: "sed -f $(location sed.ext4) $(in) > $(out)",
 }
 
 prebuilt_etc {
-    name: "cf_fstab.f2fs",
-    src: ":gen_cf_fstab_f2fs",
-    filename: "fstab.f2fs",
+    name: "fstab.cf.f2fs",
+    src: ":gen_fstab_cf_f2fs",
     vendor: true,
     vendor_ramdisk_available: true,
 }
 
 prebuilt_etc {
-    name: "cf_fstab.ext4",
-    src: ":gen_cf_fstab_ext4",
-    filename: "fstab.ext4",
+    name: "fstab.cf.ext4",
+    src: ":gen_fstab_cf_ext4",
     vendor: true,
     vendor_ramdisk_available: true,
 }
diff --git a/shared/device.mk b/shared/device.mk
index 169080dfd..32a2fcf4e 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -344,10 +344,10 @@ PRODUCT_COPY_FILES += \
 endif
 
 PRODUCT_PACKAGES += \
-    cf_fstab.f2fs \
-    cf_fstab.f2fs.vendor_ramdisk \
-    cf_fstab.ext4 \
-    cf_fstab.ext4.vendor_ramdisk \
+    fstab.cf.f2fs \
+    fstab.cf.f2fs.vendor_ramdisk \
+    fstab.cf.ext4 \
+    fstab.cf.ext4.vendor_ramdisk \
 
 ifeq ($(TARGET_VULKAN_SUPPORT),true)
 ifneq ($(LOCAL_PREFER_VENDOR_APEX),true)