Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 971b86b6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "add partition system_ext back" into main am: e13bd368 am: b2d1cce9 

Original change: https://android-review.googlesource.com/c/platform/build/+/3531790



Change-Id: If6519a9cd5d91a1eb91f61e4c3f79829664e770c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6bd209d5 b2d1cce9

tools/aconfig/aconfig_storage_read_api/srcs/android/os/flagging/PlatformAconfigPackage.java

+5 −1
Original line number Diff line number Diff line
@@ -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) {

tools/aconfig/aconfig_storage_read_api/tests/functional/srcs/PlatformAconfigPackageInternalTest.java

+2 −1
Original line number Diff line number Diff line
@@ -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 {

tools/aconfig/aconfig_storage_read_api/tests/functional/srcs/PlatformAconfigPackageTest.java

+2 −1
Original line number Diff line number Diff line
@@ -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 {

tools/aconfig/fake_device_config/src/android/os/flagging/PlatformAconfigPackage.java

+5 −1
Original line number Diff line number Diff line
@@ -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!");