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

Commit c16f4706 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 

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



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

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()) {