diff options
| author | yikun.yu <yikun.yu@samsung.com> | 2024-02-21 05:41:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-02-21 05:41:52 +0000 |
| commit | 858059e4c10afd85ccd370034a7fb61f73375f2b (patch) | |
| tree | a5185dd64b6f3107681b313718c3b3e1de8e39a3 | |
| parent | dc6202bcc1156e80b628339b7795d25b68dcc50f (diff) | |
| parent | a3e0d50468f66c4b9276129da056ee232701cce9 (diff) | |
| download | gsid-858059e4c10afd85ccd370034a7fb61f73375f2b.tar.gz | |
Skip the f2fs check for the automotive devices in Android 13. am: a3e0d50468
Original change: https://android-review.googlesource.com/c/platform/system/gsid/+/2557090
Change-Id: Iabd3b6b74208a1cb3b91d60a4468205726a6ddeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | tests/boot_tests.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tests/boot_tests.cpp b/tests/boot_tests.cpp index 6aeded3..6264843 100644 --- a/tests/boot_tests.cpp +++ b/tests/boot_tests.cpp @@ -35,6 +35,12 @@ using android::hardware::weaver::V1_0::IWeaver; using android::hardware::weaver::V1_0::WeaverConfig; using android::hardware::weaver::V1_0::WeaverStatus; + +static bool IsAutomotiveDevice() { + auto hw_type = android::base::GetProperty("ro.hardware.type", ""); + return hw_type == "automotive"; +} + TEST(MetadataPartition, FirstStageMount) { Fstab fstab; if (ReadFstabFromDt(&fstab)) { @@ -85,7 +91,7 @@ TEST(Weaver, MinimumSlots) { } TEST(MetadataPartition, FsType) { - if (GetVsrLevel() < __ANDROID_API_T__) { + if (GetVsrLevel() < __ANDROID_API_T__ || IsAutomotiveDevice()) { GTEST_SKIP(); } |