diff options
| author | 2025-03-07 20:09:04 +0000 | |
|---|---|---|
| committer | 2025-03-07 20:10:44 +0000 | |
| commit | e9b707b91b6b7191bb689ff6b7197ca16ada21cd (patch) | |
| tree | 356bdacc8c6d1f6ef276971730d07be54cee7c47 | |
| parent | fdca9c65fb8ff6c10067467d986624965f09cb04 (diff) | |
add partition system_ext back
Test: atest aconfig_storage_read_functional
Bug: 401571194
Flag: EXEMPT REFACTOR
Change-Id: I0f07dc5a965706ed782b083be97b47fd35c64f12
4 files changed, 14 insertions, 4 deletions
diff --git a/tools/aconfig/aconfig_storage_read_api/srcs/android/os/flagging/PlatformAconfigPackage.java b/tools/aconfig/aconfig_storage_read_api/srcs/android/os/flagging/PlatformAconfigPackage.java index ddad249fa0..63baf9e844 100644 --- a/tools/aconfig/aconfig_storage_read_api/srcs/android/os/flagging/PlatformAconfigPackage.java +++ b/tools/aconfig/aconfig_storage_read_api/srcs/android/os/flagging/PlatformAconfigPackage.java @@ -65,7 +65,11 @@ public class PlatformAconfigPackage { /** @hide */ @UnsupportedAppUsage public static final Set<String> PLATFORM_PACKAGE_MAP_FILES = - Set.of("system.package.map", "vendor.package.map", "product.package.map"); + Set.of( + "system.package.map", + "system_ext.package.map", + "vendor.package.map", + "product.package.map"); static { for (String pf : PLATFORM_PACKAGE_MAP_FILES) { diff --git a/tools/aconfig/aconfig_storage_read_api/tests/functional/srcs/PlatformAconfigPackageInternalTest.java b/tools/aconfig/aconfig_storage_read_api/tests/functional/srcs/PlatformAconfigPackageInternalTest.java index 9896baff87..0c5bc1c2c7 100644 --- a/tools/aconfig/aconfig_storage_read_api/tests/functional/srcs/PlatformAconfigPackageInternalTest.java +++ b/tools/aconfig/aconfig_storage_read_api/tests/functional/srcs/PlatformAconfigPackageInternalTest.java @@ -42,7 +42,8 @@ import java.util.Set; @RunWith(JUnit4.class) public class PlatformAconfigPackageInternalTest { - private static final Set<String> PLATFORM_CONTAINERS = Set.of("system", "vendor", "product"); + private static final Set<String> PLATFORM_CONTAINERS = + Set.of("system", "system_ext", "vendor", "product"); @Test public void testPlatformAconfigPackageInternal_load() throws IOException { diff --git a/tools/aconfig/aconfig_storage_read_api/tests/functional/srcs/PlatformAconfigPackageTest.java b/tools/aconfig/aconfig_storage_read_api/tests/functional/srcs/PlatformAconfigPackageTest.java index 1c6c238542..2b4ead8777 100644 --- a/tools/aconfig/aconfig_storage_read_api/tests/functional/srcs/PlatformAconfigPackageTest.java +++ b/tools/aconfig/aconfig_storage_read_api/tests/functional/srcs/PlatformAconfigPackageTest.java @@ -42,7 +42,8 @@ import java.util.Set; @RunWith(JUnit4.class) public class PlatformAconfigPackageTest { - private static final Set<String> PLATFORM_CONTAINERS = Set.of("system", "vendor", "product"); + private static final Set<String> PLATFORM_CONTAINERS = + Set.of("system", "system_ext", "vendor", "product"); @Test public void testPlatformAconfigPackage_StorageFilesCache() throws IOException { diff --git a/tools/aconfig/fake_device_config/src/android/os/flagging/PlatformAconfigPackage.java b/tools/aconfig/fake_device_config/src/android/os/flagging/PlatformAconfigPackage.java index ec79f7daa1..c06a532dc3 100644 --- a/tools/aconfig/fake_device_config/src/android/os/flagging/PlatformAconfigPackage.java +++ b/tools/aconfig/fake_device_config/src/android/os/flagging/PlatformAconfigPackage.java @@ -24,7 +24,11 @@ import java.util.Set; public class PlatformAconfigPackage { public static final Set<String> PLATFORM_PACKAGE_MAP_FILES = - Set.of("system.package.map", "vendor.package.map", "product.package.map"); + Set.of( + "system.package.map", + "system_ext.package.map", + "vendor.package.map", + "product.package.map"); public static PlatformAconfigPackage load(String packageName) { throw new UnsupportedOperationException("Stub!"); |