commit db7b6810397710133b63192d9a752321a35be161
author Hongyang Jiao <jiaohy@google.com> Wed May 15 06:50:51 2024 +0000
committer Hongyang Jiao <jiaohy@google.com> Wed May 15 06:50:55 2024 +0000
tree 17beb6aeb47c8d97168f7358acc4f9c568562084
parent 15538c9845b1bc7b629693b55195f579025cdd82

Remove BetterBug (and BetterBugStub) from aosp & factory build targets.

Bug:340172938
Change-Id: I82fc888497b23b9537f06f1727511608cb1e8ec8
Test: Manual

betterbug/betterbug.mk

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