Merge "VSDK: etc snapshot may have sub_dir for relative_install_path"

2023-05-16 04:03:49 +00:00
parent 9f96a17653 8bd3afe68c
commit 5d5ccb43da
1 changed files with 1 additions and 3 deletions
--- a/etc/prebuilt_etc.go
+++ b/etc/prebuilt_etc.go
@@ -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