diff options
author | Ram Muthiah <rammuthiah@google.com> | 2023-05-30 08:01:18 -0700 |
---|---|---|
committer | Ram Muthiah <rammuthiah@google.com> | 2023-05-31 23:55:17 +0000 |
commit | 44f7cd08e2528bb53106dc215e225b6ec423eb93 (patch) | |
tree | 3e3b8b59cec449ec97162eb483e1aff19d2699ca | |
parent | be9ddb8201a3c654b57848f02495e36a4766ff23 (diff) | |
download | cuttlefish-44f7cd08e2528bb53106dc215e225b6ec423eb93.tar.gz |
Note default filename encryption on Cuttlefish
No change in using AES-CTS on TM branches. Needs to be fully
specified to maintain compatability with master cuttlefish launcher.
Bug: 233652475
Bug: 285204672
Test: Boot with master launcher packaage and tm-qpr-dev launcher package
Merged-In: I028b5d689aa062c8e0aae8f37f3de88ffcf16c4a
Change-Id: I3caf9c94ddeee1b63cdc122cd72201684370c1f8
-rw-r--r-- | Android.mk | 4 | ||||
-rw-r--r-- | host/libs/config/bootconfig_args.cpp | 4 | ||||
-rw-r--r-- | shared/BoardConfig.mk | 2 | ||||
-rw-r--r-- | shared/config/Android.bp | 16 | ||||
-rw-r--r-- | shared/device.mk | 8 |
5 files changed, 17 insertions, 17 deletions
diff --git a/Android.mk b/Android.mk index 6d30ea82c..fe6abb534 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.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,fstab.cf.f2fs.cts,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) +$(eval $(call declare-copy-files-license-metadata,device/google/cuttlefish,fstab.cf.ext4.cts,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 9451514f2..d8ef114d9 100644 --- a/host/libs/config/bootconfig_args.cpp +++ b/host/libs/config/bootconfig_args.cpp @@ -154,8 +154,8 @@ std::vector<std::string> BootconfigArgsFromConfig( instance.modem_simulator_ports())); } - bootconfig_args.push_back(concat("androidboot.fstab_suffix=cf.", - config.userdata_format())); + std::string fstab_suffix = fmt::format("cf.{}.{}", config.userdata_format(), "cts"); + bootconfig_args.push_back(concat("androidboot.fstab_suffix=", fstab_suffix)); bootconfig_args.push_back( concat("androidboot.wifi_mac_prefix=", instance.wifi_mac_prefix())); diff --git a/shared/BoardConfig.mk b/shared/BoardConfig.mk index a9d83632a..6e1b95c7b 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_fstab_cf_f2fs +TARGET_RECOVERY_FSTAB_GENRULE := gen_fstab_cf_f2fs_cts 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 8954fd6ff..40c3f933d 100644 --- a/shared/config/Android.bp +++ b/shared/config/Android.bp @@ -91,31 +91,31 @@ filegroup { } genrule { - name: "gen_fstab_cf_f2fs", + name: "gen_fstab_cf_f2fs_cts", srcs: ["fstab.in"], - out: ["fstab.cf.f2fs"], + out: ["fstab.cf.f2fs.cts"], tool_files: [ "sed.f2fs" ], cmd: "sed -f $(location sed.f2fs) $(in) > $(out)", } genrule { - name: "gen_fstab_cf_ext4", + name: "gen_fstab_cf_ext4_cts", srcs: ["fstab.in"], - out: ["fstab.cf.ext4"], + out: ["fstab.cf.ext4.cts"], tool_files: [ "sed.ext4" ], cmd: "sed -f $(location sed.ext4) $(in) > $(out)", } prebuilt_etc { - name: "fstab.cf.f2fs", - src: ":gen_fstab_cf_f2fs", + name: "fstab.cf.f2fs.cts", + src: ":gen_fstab_cf_f2fs_cts", vendor: true, vendor_ramdisk_available: true, } prebuilt_etc { - name: "fstab.cf.ext4", - src: ":gen_fstab_cf_ext4", + name: "fstab.cf.ext4.cts", + src: ":gen_fstab_cf_ext4_cts", vendor: true, vendor_ramdisk_available: true, } diff --git a/shared/device.mk b/shared/device.mk index 32a2fcf4e..b67eeffca 100644 --- a/shared/device.mk +++ b/shared/device.mk @@ -344,10 +344,10 @@ PRODUCT_COPY_FILES += \ endif PRODUCT_PACKAGES += \ - fstab.cf.f2fs \ - fstab.cf.f2fs.vendor_ramdisk \ - fstab.cf.ext4 \ - fstab.cf.ext4.vendor_ramdisk \ + fstab.cf.f2fs.cts \ + fstab.cf.f2fs.cts.vendor_ramdisk \ + fstab.cf.ext4.cts \ + fstab.cf.ext4.cts.vendor_ramdisk \ ifeq ($(TARGET_VULKAN_SUPPORT),true) ifneq ($(LOCAL_PREFER_VENDOR_APEX),true) |