diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 49df60b69..c7a4ed449 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -112,6 +112,7 @@ PRODUCT_PACKAGES += \
     iptables \
     ip-up-vpn \
     javax.obex \
+    jobscheduler-service \
     keystore \
     ld.config.txt \
     ld.mc \
diff --git a/target/product/media_system.mk b/target/product/media_system.mk
index 5c0902dbc..04cab45b7 100644
--- a/target/product/media_system.mk
+++ b/target/product/media_system.mk
@@ -52,6 +52,7 @@ endif
 # The order here is the same order they end up on the classpath, so it matters.
 PRODUCT_SYSTEM_SERVER_JARS := \
     services \
+    jobscheduler-service \
     ethernet-service \
     wifi-service \
     com.android.location.provider \