commit ddbc3a43bcad1db516c114aca87df90d1780e728
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Apr 12 21:39:37 2024 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Apr 12 21:39:37 2024 +0000
tree 0242fb5d9a671310dc6aa5be47855242c6a1fb08
parent dad90984a0bb2b8b5b8ce941168b4fbeb682bf15
parent 0e3f3c1d885041477bdcf01df2db2f4ec15d6075

Merge cherrypicks of ['googleplex-android-review.googlesource.com/26700171'] into 24Q2-release.

Change-Id: Ib4d499d8ed42c5b5abb59d450aa82e6bdde54f91

gyotaku_app/gyotaku.mk

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