Merge branch 'cm-11.0' into stable/cm-11.0

TheMuppets · Nov 4, 2014 · bbbef3f · bbbef3f
2 parents adfd3c1 + 6ce189c
commit bbbef3f
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 1 deletion.
diff --git a/ghost/Android.mk b/ghost/Android.mk
@@ -48,6 +48,16 @@ LOCAL_MODULE_CLASS := APPS
 LOCAL_CERTIFICATE := platform
 include $(BUILD_PREBUILT)
 
+include $(CLEAR_VARS)
+LOCAL_MODULE := TimeService
+LOCAL_MODULE_OWNER := motorola
+LOCAL_SRC_FILES := proprietary/app/TimeService.apk
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
+LOCAL_MODULE_CLASS := APPS
+LOCAL_CERTIFICATE := platform
+include $(BUILD_PREBUILT)
+
 include $(CLEAR_VARS)
 LOCAL_MODULE := libtime_genoff
 LOCAL_MODULE_OWNER := motorola

diff --git a/ghost/ghost-vendor-blobs.mk b/ghost/ghost-vendor-blobs.mk
@@ -222,7 +222,6 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/ghost/proprietary/etc/firmware/mspversion_p0.txt:system/etc/firmware/mspversion_p0.txt \
     vendor/motorola/ghost/proprietary/etc/firmware/mspversion_p1.txt:system/etc/firmware/mspversion_p1.txt \
     vendor/motorola/ghost/proprietary/etc/firmware/mspversion_p2.txt:system/etc/firmware/mspversion_p2.txt \
-    vendor/motorola/ghost/proprietary/lib/hw/nfc.msm8960.so:system/lib/hw/nfc.msm8960.so \
     vendor/motorola/ghost/proprietary/bin/mm-pp-daemon:system/bin/mm-pp-daemon \
     vendor/motorola/ghost/proprietary/lib/libmm-abl.so:system/lib/libmm-abl.so \
     vendor/motorola/ghost/proprietary/lib/libmm-abl-oem.so:system/lib/libmm-abl-oem.so \
@@ -265,3 +264,4 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/ghost/proprietary/etc/firmware/synaptics-s3402-13040101-164656-ghost-p1a.tdat:system/etc/firmware/synaptics-s3402-13040101-164656-ghost-p1a.tdat \
     vendor/motorola/ghost/proprietary/etc/firmware/synaptics-s3402b-13050201-167746-ghost.tdat:system/etc/firmware/synaptics-s3402b-13050201-167746-ghost.tdat \
     vendor/motorola/ghost/proprietary/bin/time_daemon:system/bin/time_daemon \
+    vendor/motorola/ghost/proprietary/lib/libTimeService.so:system/lib/libTimeService.so
diff --git a/ghost/ghost-vendor.mk b/ghost/ghost-vendor.mk
@@ -21,6 +21,7 @@ PRODUCT_PACKAGES += \
     MotGeoFenceSvc
 
 PRODUCT_PACKAGES += \
+    TimeService \
     libtime_genoff
 
 $(call inherit-product, vendor/motorola/ghost/ghost-vendor-blobs.mk)
diff --git a/ghost/proprietary/app/TimeService.apk b/ghost/proprietary/app/TimeService.apk
diff --git a/ghost/proprietary/lib/hw/nfc.msm8960.so → ghost/proprietary/lib/libTimeService.so b/ghost/proprietary/lib/hw/nfc.msm8960.so → ghost/proprietary/lib/libTimeService.so