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

Merge "VSDK: etc snapshot may have sub_dir for relative_install_path" into udc-dev

Browse Source
This commit is contained in:
Treehugger Robot
2023-05-23 23:19:22 +00:00
committed by Android (Google) Code Review
parent 267a137415 82283a3b4f
commit 66902d7ec0
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
etc/prebuilt_etc.go
View File

@@ -652,9 +652,7 @@ func generatePrebuiltSnapshot(s snapshot.SnapshotSingleton, ctx android.Singleto
prop := snapshot.SnapshotJsonFlags{} prop := snapshot.SnapshotJsonFlags{}
propOut := snapshotLibOut + ".json" propOut := snapshotLibOut + ".json"
prop.InitBaseSnapshotProps(m) prop.InitBaseSnapshotProps(m)
if m.subdirProperties.Relative_install_path != nil { prop.RelativeInstallPath = m.SubDir()
prop.RelativeInstallPath = *m.subdirProperties.Relative_install_path
}
if m.properties.Filename != nil { if m.properties.Filename != nil {
prop.Filename = *m.properties.Filename prop.Filename = *m.properties.Filename