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

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

Merge "remove apex or capex extension from apex" into main am: 6f356936 am: c16f4706 

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



Change-Id: Iee0356686f54649caf1a16f7118d1df2db25b83e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9e4e0718 c16f4706

tools/aconfig/aconfig_device_paths/src/DeviceProtosTestUtilTemplate.java

+1 −7
Original line number Diff line number Diff line
@@ -78,14 +78,8 @@ public class DeviceProtosTestUtil { 
        }



        for (File prefix : subdirs) {

            // For each mainline modules, there are two directories, one <modulepackage>/,

            // and one <modulepackage>@<versioncode>/. Just read the former.

            if (!prefix.getAbsolutePath().endsWith(".apex")) {

                continue;

            }



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

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

            apexName = apexName.substring(0, apexName.lastIndexOf('.'));



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

            if (!protoPath.exists()) {