Merge "Fix gsi_{arch} builds due to NOTICE.xml.gz" into main am: aec20ec3f8

Original change: https://android-review.googlesource.com/c/device/generic/common/+/3482011

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

gsi_arm.mk

diff --git a/gsi_arm.mk b/gsi_arm.mk
index f83b3d2..2170bd8 100644
--- a/gsi_arm.mk
+++ b/gsi_arm.mk
@@ -54,4 +54,5 @@
 PRODUCT_MODEL := GSI on ARM
 
 PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE := android_gsi
+PRODUCT_USE_SOONG_NOTICE_XML := true
 USE_SOONG_DEFINED_SYSTEM_IMAGE := true

gsi_arm64.mk

diff --git a/gsi_arm64.mk b/gsi_arm64.mk
index cb16b58..f81942f 100644
--- a/gsi_arm64.mk
+++ b/gsi_arm64.mk
@@ -58,4 +58,5 @@
 PRODUCT_MODEL := GSI on ARM64
 
 PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE := android_gsi
+PRODUCT_USE_SOONG_NOTICE_XML := true
 USE_SOONG_DEFINED_SYSTEM_IMAGE := true

gsi_x86.mk

diff --git a/gsi_x86.mk b/gsi_x86.mk
index ff3078a..7cef98e 100644
--- a/gsi_x86.mk
+++ b/gsi_x86.mk
@@ -50,4 +50,5 @@
 PRODUCT_MODEL := GSI on x86
 
 PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE := android_gsi
+PRODUCT_USE_SOONG_NOTICE_XML := true
 USE_SOONG_DEFINED_SYSTEM_IMAGE := true

gsi_x86_64.mk

diff --git a/gsi_x86_64.mk b/gsi_x86_64.mk
index d6e1f9f..3f7f419 100644
--- a/gsi_x86_64.mk
+++ b/gsi_x86_64.mk
@@ -54,4 +54,5 @@
 PRODUCT_MODEL := GSI on x86_64
 
 PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE := android_gsi
+PRODUCT_USE_SOONG_NOTICE_XML := true
 USE_SOONG_DEFINED_SYSTEM_IMAGE := true