From db7b6810397710133b63192d9a752321a35be161 Mon Sep 17 00:00:00 2001
From: Hongyang Jiao <jiaohy@google.com>
Date: Wed, 15 May 2024 06:50:51 +0000
Subject: [PATCH] Remove BetterBug (and BetterBugStub) from aosp & factory
 build targets.

Bug:340172938
Change-Id: I82fc888497b23b9537f06f1727511608cb1e8ec8
Test: Manual
---
 betterbug/betterbug.mk | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/betterbug/betterbug.mk b/betterbug/betterbug.mk
index f3ae647..906933d 100644
--- a/betterbug/betterbug.mk
+++ b/betterbug/betterbug.mk
@@ -1,5 +1,8 @@
-PRODUCT_PACKAGES += BetterBugStub
-PRODUCT_PACKAGES_DEBUG += BetterBug
+# When neither AOSP nor factory targets
+ifeq (,$(filter aosp_% factory_%, $(TARGET_PRODUCT)))
+  PRODUCT_PACKAGES += BetterBugStub
+  PRODUCT_PACKAGES_DEBUG += BetterBug
+endif
 
 PRODUCT_PUBLIC_SEPOLICY_DIRS += device/google/gs-common/betterbug/sepolicy/product/public
 PRODUCT_PRIVATE_SEPOLICY_DIRS += device/google/gs-common/betterbug/sepolicy/product/private