From 3133d362a4bff2f89f486f27eb555bd57ac5150e Mon Sep 17 00:00:00 2001 From: Klines Jiang Date: Mon, 25 Mar 2024 08:58:41 +0000 Subject: [PATCH] [Gyotaku] Update the build rule to exclude build Gyotaku dump for barbet Pixel 5a (barbet) does not support Pixel dump, we need to exclude build Pixel dump for Pixel 5a (barbet). The git_24Q2-beta-release TARGET_PRODUCT is barbet_beta, updated to barbet% for all barbet target products. Bug: 330819191 Test: Local build and trigger a new build the result passed (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d4de4ddf902f75ebcb6b0e1079e78b8a96410ed5) Merged-In: I2c1785105bab74a483bc68893d96a8a88eabfd90 Change-Id: I2c1785105bab74a483bc68893d96a8a88eabfd90 24D1-dev is based on 24Q2-release. Therefore, we merged this CL to 24D1-dev. --- gyotaku_app/gyotaku.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gyotaku_app/gyotaku.mk b/gyotaku_app/gyotaku.mk index c6c41d5..8a6bb10 100644 --- a/gyotaku_app/gyotaku.mk +++ b/gyotaku_app/gyotaku.mk @@ -6,7 +6,7 @@ ifneq ($(TARGET_BUILD_VARIANT), user) BOARD_SEPOLICY_DIRS += device/google/gs-common/gyotaku_app/sepolicy/ # Pixel 5a (barbet) does not support Pixel dump - ifneq ($(TARGET_PRODUCT), barbet) + ifeq (,$(filter barbet%,$(TARGET_PRODUCT))) PRODUCT_PACKAGES_DEBUG += dump_gyotaku BOARD_SEPOLICY_DIRS += device/google/gs-common/gyotaku_app/dump endif