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

Commit 9728a23f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Add GSI targets using soong built system image"" into main am: 20f853cb 

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



Change-Id: Iad493946befe3490759de6898f67b94187cd88b4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 22f302b9 20f853cb

core/product_config.mk

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




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

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

ifdef PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT

ifdef PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT

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

  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)))

                  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 \

    $(warning PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT is set but \

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

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

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

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