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

Merge "Expose DeviceProtos' paths to parse in Framework" into main am: 187e280d3c

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

Change-Id: I838a1f482af9232b0795d97c52dfeed5d556d87e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-09-12 21:52:53 +00:00
committed by Automerger Merge Worker
parent 8c56d035d1 187e280d3c
commit ebad1406dc
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,4 +51,8 @@ java_library {
static_libs: [
"libaconfig_java_proto_nano",
],
sdk_version: "core_platform",
apex_available: [
"//apex_available:platform",
],
}

13
tools/aconfig/aconfig_device_paths/src/DeviceProtosTemplate.java
View File

@@ -29,7 +29,7 @@ import java.util.List;
* @hide
*/
public class DeviceProtos {
static final String[] PATHS = {
public static final String[] PATHS = {
TEMPLATE
};
@@ -50,10 +50,11 @@ public class DeviceProtos {
ArrayList<parsed_flag> result = new ArrayList();
for (String path : parsedFlagsProtoPaths()) {
FileInputStream inputStream = new FileInputStream(path);
parsed_flags parsedFlags = parsed_flags.parseFrom(inputStream.readAllBytes());
for (parsed_flag flag : parsedFlags.parsedFlag) {
result.add(flag);
try (FileInputStream inputStream = new FileInputStream(path)) {
parsed_flags parsedFlags = parsed_flags.parseFrom(inputStream.readAllBytes());
for (parsed_flag flag : parsedFlags.parsedFlag) {
result.add(flag);
}
}
}
@@ -64,7 +65,7 @@ public class DeviceProtos {
* Returns the list of all on-device aconfig protos paths.
* @hide
*/
private static List<String> parsedFlagsProtoPaths() {
public static List<String> parsedFlagsProtoPaths() {
ArrayList<String> paths = new ArrayList(Arrays.asList(PATHS));
File apexDirectory = new File(APEX_DIR);