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 am: 66902d7ec0

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

Change-Id: I20d1de0cb17fb23bcec528c16993d34691a08839
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-05-24 00:15:40 +00:00
committed by Automerger Merge Worker
parent 7eaf716ded 66902d7ec0
commit 7b67d8c8e1
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