Remove redundant thinkfree apks and make a common one for every device.
Signed-off-by: iceandfire <arhamjamal@gmail.com>
diff --git a/overlay/grouper/packages/apps/ROMSettings/res/values/config.xml~ b/overlay/grouper/packages/apps/ROMSettings/res/values/config.xml~
deleted file mode 100644
index e69de29..0000000
--- a/overlay/grouper/packages/apps/ROMSettings/res/values/config.xml~
+++ /dev/null
diff --git a/products/common.mk b/products/common.mk
index cd552bf..71747d9 100644
--- a/products/common.mk
+++ b/products/common.mk
@@ -18,13 +18,13 @@
ROMSettings \
Superuser \
su \
+ Thinkfree \
Torch \
XenonWallpapers
# prebuilts
PRODUCT_PACKAGES += \
CarHome \
- GenieWidget \
RomStats\
XposedInstaller \
XposedNetflixWorkaround.apk \
diff --git a/products/xenonhd_crespo.mk b/products/xenonhd_crespo.mk
index f7bba11..4cd185d 100644
--- a/products/xenonhd_crespo.mk
+++ b/products/xenonhd_crespo.mk
@@ -21,7 +21,6 @@
# Copy crespo specific prebuilt files
PRODUCT_COPY_FILES += \
- vendor/xenonhd/proprietary/crespo/app/Thinkfree.apk:system/app/Thinkfree.apk \
vendor/xenonhd/proprietary/crespo/media/bootanimation.zip:system/media/bootanimation.zip \
vendor/xenonhd/proprietary/tuna/media/audio/notifications/Nexus.mp3:system/media/audio/notifications/Nexus.mp3 \
vendor/xenonhd/proprietary/common/media/LMprec_508.emd:system/media/LMprec_508.emd \
diff --git a/products/xenonhd_d2vzw.mk b/products/xenonhd_d2vzw.mk
index 1e4357a..5d6b23c 100644
--- a/products/xenonhd_d2vzw.mk
+++ b/products/xenonhd_d2vzw.mk
@@ -16,7 +16,6 @@
# Copy d2 specific prebuilt files
PRODUCT_COPY_FILES += \
- vendor/xenonhd/proprietary/d2-common/app/Thinkfree.apk:system/app/Thinkfree.apk \
vendor/xenonhd/proprietary/d2-common/media/bootanimation.zip:system/media/bootanimation.zip \
vendor/xenonhd/proprietary/d2-common/media/audio/notifications/Nexus.mp3:system/media/audio/notifications/Nexus.mp3 \
vendor/xenonhd/proprietary/common/media/LMprec_508.emd:system/media/LMprec_508.emd \
diff --git a/products/xenonhd_grouper.mk b/products/xenonhd_grouper.mk
index fc61617..7423314 100644
--- a/products/xenonhd_grouper.mk
+++ b/products/xenonhd_grouper.mk
@@ -1,8 +1,8 @@
# Inherit AOSP device configuration for grouper.
$(call inherit-product, device/asus/grouper/full_grouper.mk)
-# Inherit common/tablet product files.
-$(call inherit-product, vendor/xenonhd/products/common_tablet.mk)
+# Inherit common product files.
+$(call inherit-product, vendor/xenonhd/products/common.mk)
# Setup device specific product configuration.
PRODUCT_NAME := xenonhd_grouper
@@ -21,7 +21,6 @@
# Copy grouper specific prebuilt files
PRODUCT_COPY_FILES += \
- vendor/xenonhd/proprietary/grouper/app/Thinkfree.apk:system/app/Thinkfree.apk \
vendor/xenonhd/proprietary/grouper/media/bootanimation.zip:system/media/bootanimation.zip \
vendor/xenonhd/proprietary/grouper/media/audio/notifications/Nexus.mp3:system/media/audio/notifications/Nexus.mp3 \
vendor/xenonhd/proprietary/common/media/LMprec_508.emd:system/media/LMprec_508.emd \
diff --git a/products/xenonhd_maguro.mk b/products/xenonhd_maguro.mk
index 2494620..0a5337f 100644
--- a/products/xenonhd_maguro.mk
+++ b/products/xenonhd_maguro.mk
@@ -24,7 +24,6 @@
# Copy maguro specific prebuilt files
PRODUCT_COPY_FILES += \
- vendor/xenonhd/proprietary/tuna/app/Thinkfree.apk:system/app/Thinkfree.apk \
vendor/xenonhd/proprietary/tuna/media/bootanimation.zip:system/media/bootanimation.zip \
vendor/xenonhd/proprietary/tuna/media/audio/notifications/Nexus.mp3:system/media/audio/notifications/Nexus.mp3 \
vendor/xenonhd/proprietary/common/media/LMprec_508.emd:system/media/LMprec_508.emd \
diff --git a/products/xenonhd_mako.mk b/products/xenonhd_mako.mk
index 97e7665..e364571 100644
--- a/products/xenonhd_mako.mk
+++ b/products/xenonhd_mako.mk
@@ -21,7 +21,6 @@
# Copy maguro specific prebuilt files
PRODUCT_COPY_FILES += \
- vendor/xenonhd/proprietary/tuna/app/Thinkfree.apk:system/app/Thinkfree.apk \
vendor/xenonhd/proprietary/tuna/media/bootanimation.zip:system/media/bootanimation.zip \
vendor/xenonhd/proprietary/tuna/media/audio/notifications/Nexus.mp3:system/media/audio/notifications/Nexus.mp3 \
vendor/xenonhd/proprietary/common/media/LMprec_508.emd:system/media/LMprec_508.emd \
diff --git a/products/xenonhd_tilapia.mk b/products/xenonhd_tilapia.mk
index 6f5fae6..fc3b720 100644
--- a/products/xenonhd_tilapia.mk
+++ b/products/xenonhd_tilapia.mk
@@ -21,7 +21,6 @@
# Copy grouper specific prebuilt files
PRODUCT_COPY_FILES += \
- vendor/xenonhd/proprietary/grouper/app/Thinkfree.apk:system/app/Thinkfree.apk \
vendor/xenonhd/proprietary/grouper/media/bootanimation.zip:system/media/bootanimation.zip \
vendor/xenonhd/proprietary/grouper/media/audio/notifications/Nexus.mp3:system/media/audio/notifications/Nexus.mp3 \
vendor/xenonhd/proprietary/common/media/LMprec_508.emd:system/media/LMprec_508.emd \
diff --git a/products/xenonhd_toro.mk b/products/xenonhd_toro.mk
index ee1945b..3e65f98 100644
--- a/products/xenonhd_toro.mk
+++ b/products/xenonhd_toro.mk
@@ -24,7 +24,6 @@
# Copy toro specific prebuilt files
PRODUCT_COPY_FILES += \
- vendor/xenonhd/proprietary/tuna/app/Thinkfree.apk:system/app/Thinkfree.apk \
vendor/xenonhd/proprietary/tuna/media/bootanimation.zip:system/media/bootanimation.zip \
vendor/xenonhd/proprietary/tuna/media/audio/notifications/Nexus.mp3:system/media/audio/notifications/Nexus.mp3 \
vendor/xenonhd/proprietary/common/media/LMprec_508.emd:system/media/LMprec_508.emd \
diff --git a/products/xenonhd_toroplus.mk b/products/xenonhd_toroplus.mk
index c0b20aa..e29e78b 100644
--- a/products/xenonhd_toroplus.mk
+++ b/products/xenonhd_toroplus.mk
@@ -24,7 +24,6 @@
# Copy toro specific prebuilt files
PRODUCT_COPY_FILES += \
- vendor/xenonhd/proprietary/tuna/app/Thinkfree.apk:system/app/Thinkfree.apk \
vendor/xenonhd/proprietary/tuna/media/bootanimation.zip:system/media/bootanimation.zip \
vendor/xenonhd/proprietary/tuna/media/audio/notifications/Nexus.mp3:system/media/audio/notifications/Nexus.mp3 \
vendor/xenonhd/proprietary/common/media/LMprec_508.emd:system/media/LMprec_508.emd \
diff --git a/proprietary/common/app/Android.mk b/proprietary/common/app/Android.mk
index 123c094..7a4f875 100644
--- a/proprietary/common/app/Android.mk
+++ b/proprietary/common/app/Android.mk
@@ -44,3 +44,13 @@
LOCAL_MODULE_CLASS := APPS
LOCAL_CERTIFICATE := PRESIGNED
include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := Thinkfree
+LOCAL_MODULE_OWNER := XenonHD
+LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_SUFFIX := .apk
+LOCAL_MODULE_CLASS := APPS
+LOCAL_CERTIFICATE := PRESIGNED
+include $(BUILD_PREBUILT)
diff --git a/proprietary/crespo/app/Thinkfree.apk b/proprietary/crespo/app/Thinkfree.apk
deleted file mode 100644
index 1d5da48..0000000
--- a/proprietary/crespo/app/Thinkfree.apk
+++ /dev/null
Binary files differ
diff --git a/proprietary/d2-common/app/Thinkfree.apk b/proprietary/d2-common/app/Thinkfree.apk
deleted file mode 100644
index 1d5da48..0000000
--- a/proprietary/d2-common/app/Thinkfree.apk
+++ /dev/null
Binary files differ
diff --git a/proprietary/grouper/app/Thinkfree.apk b/proprietary/grouper/app/Thinkfree.apk
deleted file mode 100644
index 1d5da48..0000000
--- a/proprietary/grouper/app/Thinkfree.apk
+++ /dev/null
Binary files differ
diff --git a/proprietary/stingray/app/StingrayQuickOffice.apk b/proprietary/stingray/app/StingrayQuickOffice.apk
deleted file mode 100644
index 465ac7a..0000000
--- a/proprietary/stingray/app/StingrayQuickOffice.apk
+++ /dev/null
Binary files differ
diff --git a/proprietary/tuna/app/Thinkfree.apk b/proprietary/tuna/app/Thinkfree.apk
deleted file mode 100644
index 1d5da48..0000000
--- a/proprietary/tuna/app/Thinkfree.apk
+++ /dev/null
Binary files differ