StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "fix: make device paths function static" into main am: 0d18be30ae

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/3164421

Change-Id: I7fd3e74a9cd1923ee449a41f584fc7be65df718e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-07-11 14:07:50 +00:00
committed by Automerger Merge Worker
parent 0a1b4dfdaf 0d18be30ae
commit 68249a141d
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/aconfig/aconfig_device_paths/Android.bp
View File

@@ -42,10 +42,11 @@ genrule {
srcs: ["src/DevicePathsTemplate.java"],
out: ["DevicePaths.java"],
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 {
name: "aconfig_device_paths_java",
srcs: [":libaconfig_java_device_paths_src"],
sdk_version: "core_current",
}

2
tools/aconfig/aconfig_device_paths/src/DevicePathsTemplate.java
View File

@@ -36,7 +36,7 @@ public class DevicePaths {
* Returns the list of all on-device aconfig protos paths.
* @hide
*/
public List<String> parsedFlagsProtoPaths() {
public static List<String> parsedFlagsProtoPaths() {
ArrayList<String> paths = new ArrayList(Arrays.asList(PATHS));
File apexDirectory = new File(APEX_DIR);