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

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

Merge "replace apex name com.google to com" into main am: 323cca9a 

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



Change-Id: I9624d7415e6c3c1a33273ee16db7f3093ac1cd6d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1b804226 323cca9a

tools/aconfig/aconfig_device_paths/src/DeviceProtosTestUtilTemplate.java

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ public class DeviceProtosTestUtil { 
                continue;

            }



            String apexName = prefix.getName();

            String apexName = prefix.getName().replace("com.google", "com");

            apexName = apexName.substring(0, apexName.length() - 5);



            File protoPath = new File(APEX_DIR + apexName + APEX_ACONFIG_PATH_SUFFIX);

tools/aconfig/aconfig_device_paths/test/src/DeviceProtosTestUtilTest.java

+2 −2
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ public class DeviceProtosTestUtilTest { 
            }

        }



        assertTrue(platformFlags > 0);

        assertTrue(mainlineFlags > 0);

        assertTrue(platformFlags > 3);

        assertTrue(mainlineFlags > 3);

    }

}