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

Commit 03e50ad3 authored by Wenshan Fu's avatar Wenshan Fu Committed by Automerger Merge Worker
Browse files

Merge "Read the proto paths with root" into main am: 1ef2ac63 

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



Change-Id: Icd3d1d12b530f2ce0250cd19ea36014822ce19f9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c36a57f5 1ef2ac63

tools/aconfig/aconfig_device_paths/src/HostDeviceProtosTemplate.java

+3 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import java.util.stream.Collectors; 


/**

 * A host lib that can read all aconfig proto file paths on a given device.

 * This lib is only available on device with root access (userdebug/eng).

 */

public class HostDeviceProtos {

    /**
@@ -40,7 +41,8 @@ public class HostDeviceProtos { 
    };



    private static final String APEX_DIR = "/apex";

    private static final String RECURSIVELY_LIST_APEX_DIR_COMMAND = "shell find /apex | grep aconfig_flags";

    private static final String RECURSIVELY_LIST_APEX_DIR_COMMAND =

        "shell su 0 find /apex | grep aconfig_flags";

    private static final String APEX_ACONFIG_PATH_SUFFIX = "/etc/aconfig_flags.pb";