Merge "VSDK: etc snapshot may have sub_dir for relative_install_path" into udc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
66902d7ec0
@@ -652,9 +652,7 @@ func generatePrebuiltSnapshot(s snapshot.SnapshotSingleton, ctx android.Singleto
|
||||
prop := snapshot.SnapshotJsonFlags{}
|
||||
propOut := snapshotLibOut + ".json"
|
||||
prop.InitBaseSnapshotProps(m)
|
||||
if m.subdirProperties.Relative_install_path != nil {
|
||||
prop.RelativeInstallPath = *m.subdirProperties.Relative_install_path
|
||||
}
|
||||
prop.RelativeInstallPath = m.SubDir()
|
||||
|
||||
if m.properties.Filename != nil {
|
||||
prop.Filename = *m.properties.Filename
|
||||
|
Reference in New Issue
Block a user