commit 4db1cf525a110ac81f261f38a08c4a76e8d5c6cb
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed May 24 00:15:38 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed May 24 00:15:38 2023 +0000
tree b7c3ba55ac9cf22304e77bbf4733bf66af875286
parent 554b3d7dbe284bea1e5b7cca6a29e86f4a9dfa91
parent 66902d7ec06f6299467120c02b345832f9bf5c46

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

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

Change-Id: I4296718f795d02a39866c9448b18f2c7f9d6be69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

etc/prebuilt_etc.go

diff --git a/etc/prebuilt_etc.go b/etc/prebuilt_etc.go
index 6817dce..3e1bbde 100644
--- a/etc/prebuilt_etc.go
+++ b/etc/prebuilt_etc.go
@@ -652,9 +652,7 @@
 		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