diff --git a/ramdump_and_coredump/ramdump_and_coredump.mk b/ramdump_and_coredump/ramdump_and_coredump.mk
index b235084..24af44e 100644
--- a/ramdump_and_coredump/ramdump_and_coredump.mk
+++ b/ramdump_and_coredump/ramdump_and_coredump.mk
@@ -1,11 +1,15 @@
 PRODUCT_PACKAGES += \
   sscoredump \
-  SSRestartDetector
 
 PRODUCT_PACKAGES_DEBUG += \
     dump_ramdump \
     ramdump \
-    RamdumpUploader
+
+# When not AOSP targets
+ifeq (,$(filter aosp_%, $(TARGET_PRODUCT)))
+  PRODUCT_PACKAGES += SSRestartDetector
+  PRODUCT_PACKAGES_DEBUG += RamdumpUploader
+endif
 
 BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/ramdump_and_coredump/sepolicy