Snap for 12937884 from 856589cd53c0c39c9dcb86faf3b44404ab2ec205 to 25Q2-release

Change-Id: I750c33652a0e8507891fd81860f9a623842df010

gsi_arm.mk

diff --git a/gsi_arm.mk b/gsi_arm.mk
index 6272fb5..f83b3d2 100644
--- a/gsi_arm.mk
+++ b/gsi_arm.mk
@@ -52,3 +52,6 @@
 PRODUCT_DEVICE := generic
 PRODUCT_BRAND := Android
 PRODUCT_MODEL := GSI on ARM
+
+PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE := android_gsi
+USE_SOONG_DEFINED_SYSTEM_IMAGE := true

gsi_x86.mk

diff --git a/gsi_x86.mk b/gsi_x86.mk
index 030d9b4..ff3078a 100644
--- a/gsi_x86.mk
+++ b/gsi_x86.mk
@@ -48,3 +48,6 @@
 PRODUCT_DEVICE := generic_x86
 PRODUCT_BRAND := Android
 PRODUCT_MODEL := GSI on x86
+
+PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE := android_gsi
+USE_SOONG_DEFINED_SYSTEM_IMAGE := true