diff --git a/Android.bp b/Android.bp
index 1366e94..4b69ffd 100644
--- a/Android.bp
+++ b/Android.bp
@@ -118,17 +118,6 @@ android_app_import {
 	soc_specific: true,
 }
 
-android_app_import {
-	name: "TimeService",
-	owner: "xiaomi",
-	apk: "proprietary/vendor/app/TimeService/TimeService.apk",
-	certificate: "platform",
-	dex_preopt: {
-		enabled: false,
-	},
-	soc_specific: true,
-}
-
 android_app_import {
 	name: "PowerOffAlarm",
 	owner: "xiaomi",
diff --git a/Android.mk b/Android.mk
index d0dc4af..b72b945 100644
--- a/Android.mk
+++ b/Android.mk
@@ -28,4 +28,17 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := EXECUTABLES
 include $(BUILD_PREBUILT)
 
+include $(CLEAR_VARS)
+LOCAL_MODULE := TimeService
+LOCAL_MODULE_OWNER := xiaomi
+LOCAL_SRC_FILES := proprietary/vendor/app/TimeService/TimeService.apk
+LOCAL_CERTIFICATE := PRESIGNED
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := APPS
+LOCAL_DEX_PREOPT := false
+LOCAL_MODULE_SUFFIX := .apk
+LOCAL_VENDOR_MODULE := true
+include $(BUILD_PREBUILT)
+
+
 endif