Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8bd3afe6 authored by Justin Yun's avatar Justin Yun
Browse files

VSDK: etc snapshot may have sub_dir for relative_install_path 

prebuilt_etc may use sub_dir property to define a relative install
path. Use SubDir() to read either sub_dir or relative_install_path
property.

Bug: 282080219
Test: m vendor-image
Change-Id: I07a21c5aeb87b403854ed32976d26e70b046b8c1
parent 8ef13dbb

etc/prebuilt_etc.go

+1 −3
Original line number Diff line number Diff line
@@ -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