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

Commit 1e03c46f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add GSI targets using soong built system image" into main am: 3dc4dfbc am: 361cda52 

Original change: https://android-review.googlesource.com/c/platform/build/+/3375351



Change-Id: I2a2842a05a442266fc6ecaf7b5b2f0843be03b37
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9d032c0f 361cda52

core/product_config.mk

+3 −1
Original line number Diff line number Diff line
@@ -478,7 +478,9 @@ endif 


# Show a warning wall of text if non-compliance-GSI products set this option.

ifdef PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT

  ifeq (,$(filter gsi_arm gsi_arm64 gsi_x86 gsi_x86_64 gsi_car_arm64 gsi_car_x86_64 gsi_tv_arm gsi_tv_arm64,$(PRODUCT_NAME)))

  ifeq (,$(filter gsi_arm gsi_arm64 gsi_arm64_soong_system gsi_x86 gsi_x86_64 \

                  gsi_x86_64_soong_system gsi_car_arm64 gsi_car_x86_64 \

                  gsi_tv_arm gsi_tv_arm64,$(PRODUCT_NAME)))

    $(warning PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT is set but \

      PRODUCT_NAME ($(PRODUCT_NAME)) doesn't look like a GSI for compliance \

      testing. This is a special configuration for compliance GSI, so do make \