summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2011-12-02 13:15:02 -0800
committerKenny Root <kroot@google.com>2011-12-02 13:16:53 -0800
commit1c199cbc3a74b4e29136af33f3acd1ddc7e1dffc (patch)
tree4dc68c2f8fbf4ae091b835a7453c515ac69bda92
parent72d81a24fbe9d86b19494d06e898b68879620360 (diff)
downloadcrespo-1c199cbc3a74b4e29136af33f3acd1ddc7e1dffc.tar.gz
Fix regression in bugreport key combo
In Gingerbread, pressing the bugreport key combo when USB debugging was enabled created a bugreport. This key combo was changed to run bugmailer.sh in Honeycomb. This was further changed to run some different things in ICS, but it was disabled for user builds. These changes inadvertently made bugreport key combo not work on user builds. When the combo is pressed, this appears in dmesg: init: cannot find '/system/bin/bugmailer.sh', disabling 'bugreport' Change-Id: If3a09d9dabdc598bf714512bc402bdcb8767d25c
-rw-r--r--device_base.mk10
1 files changed, 4 insertions, 6 deletions
diff --git a/device_base.mk b/device_base.mk
index 0f43cf1..4d0f2d5 100644
--- a/device_base.mk
+++ b/device_base.mk
@@ -165,12 +165,10 @@ PRODUCT_COPY_FILES += \
device/samsung/crespo/mxt224_ts_input.idc:system/usr/idc/mxt224_ts_input.idc
# for bugmailer
-ifneq ($(TARGET_BUILD_VARIANT),user)
- PRODUCT_PACKAGES += send_bug
- PRODUCT_COPY_FILES += \
- system/extras/bugmailer/bugmailer.sh:system/bin/bugmailer.sh \
- system/extras/bugmailer/send_bug:system/bin/send_bug
-endif
+PRODUCT_PACKAGES += send_bug
+PRODUCT_COPY_FILES += \
+ system/extras/bugmailer/bugmailer.sh:system/bin/bugmailer.sh \
+ system/extras/bugmailer/send_bug:system/bin/send_bug
# These are the hardware-specific features
PRODUCT_COPY_FILES += \