From f1eaa75168352a3bd3cc6ffb0733d09a4b028f8b Mon Sep 17 00:00:00 2001 From: Dennis Shen Date: Mon, 11 Nov 2024 17:44:14 +0000 Subject: [PATCH 1/4] move aconfigd platform init service from init.rc into aconfigd.rc Bug: 378079539 Test: m Change-Id: I10c306468bf3efe3b5186851cb09b576b143512a --- rootdir/init.rc | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/rootdir/init.rc b/rootdir/init.rc index 617e60a0f..6bff34aa1 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -608,17 +608,6 @@ on post-fs mkdir /metadata/staged-install 0770 root system - mkdir /metadata/aconfig 0775 root system - mkdir /metadata/aconfig/flags 0770 root system - mkdir /metadata/aconfig/maps 0775 root system - mkdir /metadata/aconfig/boot 0775 root system - - mkdir /metadata/aconfig_test_missions 0775 root system - - # See flag enable_system_aconfigd_rust, which toggles these processes. - exec_start system_aconfigd_platform_init - exec_start aconfigd-platform-init - on late-fs # Ensure that tracefs has the correct permissions. # This does not work correctly if it is called in post-fs. From 44461354fda5b30194b04672bff0d954646d0b63 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Mon, 18 Nov 2024 19:23:45 -0800 Subject: [PATCH 2/4] snapuserd: Use GTEST_SKIP in snapuserd_test. The test harness treats an early exit as a failure, so use GTEST_SKIP() instead. Bug: 379242140 Test: vts_snapuserd_test Change-Id: I25351bb7ebf65e6c56865662d297feb4a1f635b3 (cherry picked from commit 668ffc395d0c83c9e9cdcca972e35e936a5f85f0) --- .../user-space-merge/snapuserd_test.cpp | 42 +++++++++++++++---- 1 file changed, 34 insertions(+), 8 deletions(-) diff --git a/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_test.cpp b/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_test.cpp index 271090fa5..bd835e280 100644 --- a/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_test.cpp +++ b/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_test.cpp @@ -81,6 +81,8 @@ class SnapuserdTestBase : public ::testing::TestWithParam { unique_fd GetCowFd() { return unique_fd{dup(cow_system_->fd)}; } + bool ShouldSkipSetUp(); + std::unique_ptr harness_; size_t size_ = 10_MiB; int total_base_size_ = 0; @@ -96,6 +98,10 @@ class SnapuserdTestBase : public ::testing::TestWithParam { }; void SnapuserdTestBase::SetUp() { + if (ShouldSkipSetUp()) { + GTEST_SKIP() << "snapuserd not supported on this device"; + } + #if __ANDROID__ harness_ = std::make_unique(); #else @@ -103,6 +109,16 @@ void SnapuserdTestBase::SetUp() { #endif } +bool SnapuserdTestBase::ShouldSkipSetUp() { +#ifdef __ANDROID__ + if (!android::snapshot::CanUseUserspaceSnapshots() || + android::snapshot::IsVendorFromAndroid12()) { + return true; + } +#endif + return false; +} + void SnapuserdTestBase::TearDown() { cow_system_ = nullptr; } @@ -301,6 +317,9 @@ class SnapuserdTest : public SnapuserdTestBase { }; void SnapuserdTest::SetUp() { + if (ShouldSkipSetUp()) { + GTEST_SKIP() << "snapuserd not supported on this device"; + } ASSERT_NO_FATAL_FAILURE(SnapuserdTestBase::SetUp()); handlers_ = std::make_unique(); } @@ -311,6 +330,9 @@ void SnapuserdTest::TearDown() { } void SnapuserdTest::Shutdown() { + if (!handlers_) { + return; + } if (dmuser_dev_) { ASSERT_TRUE(dmuser_dev_->Destroy()); } @@ -1180,6 +1202,9 @@ void SnapuserdVariableBlockSizeTest::ReadSnapshotWithVariableBlockSize() { } void SnapuserdVariableBlockSizeTest::SetUp() { + if (ShouldSkipSetUp()) { + GTEST_SKIP() << "snapuserd not supported on this device"; + } ASSERT_NO_FATAL_FAILURE(SnapuserdTest::SetUp()); } @@ -1243,6 +1268,9 @@ void HandlerTest::InitializeDevice() { } void HandlerTest::SetUp() { + if (ShouldSkipSetUp()) { + GTEST_SKIP() << "snapuserd not supported on this device"; + } ASSERT_NO_FATAL_FAILURE(SnapuserdTestBase::SetUp()); ASSERT_NO_FATAL_FAILURE(CreateBaseDevice()); ASSERT_NO_FATAL_FAILURE(SetUpV2Cow()); @@ -1250,6 +1278,9 @@ void HandlerTest::SetUp() { } void HandlerTest::TearDown() { + if (ShouldSkipSetUp()) { + return; + } ASSERT_TRUE(factory_.DeleteQueue(system_device_ctrl_name_)); ASSERT_TRUE(handler_thread_.get()); SnapuserdTestBase::TearDown(); @@ -1325,6 +1356,9 @@ class HandlerTestV3 : public HandlerTest { }; void HandlerTestV3::SetUp() { + if (ShouldSkipSetUp()) { + GTEST_SKIP() << "snapuserd not supported on this device"; + } ASSERT_NO_FATAL_FAILURE(SnapuserdTestBase::SetUp()); ASSERT_NO_FATAL_FAILURE(CreateBaseDevice()); ASSERT_NO_FATAL_FAILURE(SetUpV3Cow()); @@ -1528,14 +1562,6 @@ INSTANTIATE_TEST_SUITE_P(Io, HandlerTest, ::testing::ValuesIn(GetTestConfigs())) int main(int argc, char** argv) { ::testing::InitGoogleTest(&argc, argv); -#ifdef __ANDROID__ - if (!android::snapshot::CanUseUserspaceSnapshots() || - android::snapshot::IsVendorFromAndroid12()) { - std::cerr << "snapuserd_test not supported on this device\n"; - return 0; - } -#endif - gflags::ParseCommandLineFlags(&argc, &argv, false); return RUN_ALL_TESTS(); From 267207a1720927acfb575ea348a7067631be2c41 Mon Sep 17 00:00:00 2001 From: Daniel Zheng Date: Tue, 12 Nov 2024 14:26:46 -0800 Subject: [PATCH 3/4] use V4 Health HAL use health HAL v4 for fastbootd, healthd, and storaged Ignore-AOSP-First: deprecated_ota_test compilation Bug: 371322457 Test: th Change-Id: Ia941d67a5248641246a7298487c6a13fe92d8d66 --- fastboot/Android.bp | 2 +- healthd/Android.bp | 19 +++++++++++-------- storaged/Android.bp | 4 ++-- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/fastboot/Android.bp b/fastboot/Android.bp index d3e058150..4d9898758 100644 --- a/fastboot/Android.bp +++ b/fastboot/Android.bp @@ -170,7 +170,7 @@ cc_binary { "android.hardware.fastboot@1.1", "android.hardware.fastboot-V1-ndk", "android.hardware.health@2.0", - "android.hardware.health-V3-ndk", + "android.hardware.health-V4-ndk", "libasyncio", "libbase", "libbinder_ndk", diff --git a/healthd/Android.bp b/healthd/Android.bp index e158e07e4..7eb6edde1 100644 --- a/healthd/Android.bp +++ b/healthd/Android.bp @@ -4,7 +4,10 @@ package { cc_defaults { name: "libbatterymonitor_defaults", - cflags: ["-Wall", "-Werror"], + cflags: [ + "-Wall", + "-Werror", + ], vendor_available: true, recovery_available: true, export_include_dirs: ["include"], @@ -76,7 +79,7 @@ cc_library_static { defaults: ["libbatterymonitor_defaults"], srcs: ["BatteryMonitor.cpp"], static_libs: [ - "android.hardware.health-V3-ndk", + "android.hardware.health-V4-ndk", ], whole_static_libs: [ // Need to translate HIDL to AIDL to support legacy APIs in @@ -165,12 +168,12 @@ cc_library_static { defaults: ["libhealthd_charger_ui_defaults"], static_libs: [ - "android.hardware.health-V3-ndk", + "android.hardware.health-V4-ndk", "android.hardware.health-translate-ndk", ], export_static_lib_headers: [ - "android.hardware.health-V3-ndk", + "android.hardware.health-V4-ndk", ], } @@ -242,7 +245,7 @@ cc_defaults { static_libs: [ // common "android.hardware.health@1.0-convert", - "android.hardware.health-V3-ndk", + "android.hardware.health-V4-ndk", "libbatterymonitor", "libcharger_sysprop", "libhealthd_charger_nops", @@ -287,8 +290,8 @@ cc_binary { "libminui", "libsuspend", ], - } - } + }, + }, } cc_test { @@ -307,7 +310,7 @@ cc_test { defaults: ["charger_defaults"], srcs: [ "AnimationParser_test.cpp", - "healthd_mode_charger_test.cpp" + "healthd_mode_charger_test.cpp", ], static_libs: [ "android.hardware.health@1.0", diff --git a/storaged/Android.bp b/storaged/Android.bp index 357c0e601..335874280 100644 --- a/storaged/Android.bp +++ b/storaged/Android.bp @@ -24,7 +24,7 @@ cc_defaults { shared_libs: [ "android.hardware.health@1.0", "android.hardware.health@2.0", - "android.hardware.health-V3-ndk", + "android.hardware.health-V4-ndk", "libbase", "libbinder", "libbinder_ndk", @@ -47,7 +47,7 @@ cc_defaults { "-Wall", "-Werror", "-Wextra", - "-Wno-unused-parameter" + "-Wno-unused-parameter", ], } From fef2dff80a7e44cf23decf0629c7d2dba27bac0b Mon Sep 17 00:00:00 2001 From: Jooyung Han Date: Mon, 25 Nov 2024 08:32:05 +0000 Subject: [PATCH 4/4] Remove /data/apex/hashtree directory This directory is no longer used. Bug: 184914612 Change-Id: Iaa094e2df39c363fe0a5ffd4b27b5c3075bb4f7f Test: (device doesn't have the directory) --- rootdir/init.rc | 1 - 1 file changed, 1 deletion(-) diff --git a/rootdir/init.rc b/rootdir/init.rc index 6771c5fde..f00479ece 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -736,7 +736,6 @@ on post-fs-data mkdir /data/apex/active 0755 root system mkdir /data/apex/backup 0700 root system mkdir /data/apex/decompressed 0755 root system encryption=Require - mkdir /data/apex/hashtree 0700 root system mkdir /data/apex/sessions 0700 root system mkdir /data/app-staging 0751 system system encryption=DeleteIfNecessary mkdir /data/apex/ota_reserved 0700 root system encryption=Require