commit aebd22a825963d44027830ad548d95a04a96f0e6
author Hongyang Jiao <jiaohy@google.com> Fri May 17 04:11:46 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri May 17 04:11:46 2024 +0000
tree 624574fd67de31cc993b65c82772aaf9b29eb423
parent d1a07d0197a97710fc8b9e179bb2d438dd809301
parent db7b6810397710133b63192d9a752321a35be161

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

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/27350056

Change-Id: I9654dffa12d9e1c23f8f523a6753b8d48a9cd3b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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