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

Commit 0d18be30 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "fix: make device paths function static" into main

parents 33118a7e ba67436d

tools/aconfig/aconfig_device_paths/Android.bp

+2 −1
Original line number Original line Diff line number Diff line
@@ -42,10 +42,11 @@ genrule { 
    srcs: ["src/DevicePathsTemplate.java"],

    srcs: ["src/DevicePathsTemplate.java"],

    out: ["DevicePaths.java"],

    out: ["DevicePaths.java"],

    tool_files: ["partition_aconfig_flags_paths.txt"],

    tool_files: ["partition_aconfig_flags_paths.txt"],

    cmd: "sed -e '/TEMPLATE/{r$(location partition_aconfig_flags_paths.txt)' -e 'd}' $(in) > $(out)"

    cmd: "sed -e '/TEMPLATE/{r$(location partition_aconfig_flags_paths.txt)' -e 'd}' $(in) > $(out)",

}

}





java_library {

java_library {

    name: "aconfig_device_paths_java",

    name: "aconfig_device_paths_java",

    srcs: [":libaconfig_java_device_paths_src"],

    srcs: [":libaconfig_java_device_paths_src"],

    sdk_version: "core_current",

}
 
}

tools/aconfig/aconfig_device_paths/src/DevicePathsTemplate.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -36,7 +36,7 @@ public class DevicePaths { 
     * Returns the list of all on-device aconfig protos paths.

     * Returns the list of all on-device aconfig protos paths.

     * @hide

     * @hide

     */

     */

    public List<String> parsedFlagsProtoPaths() {

    public static List<String> parsedFlagsProtoPaths() {

        ArrayList<String> paths = new ArrayList(Arrays.asList(PATHS));

        ArrayList<String> paths = new ArrayList(Arrays.asList(PATHS));





        File apexDirectory = new File(APEX_DIR);

        File apexDirectory = new File(APEX_DIR);