Blissify
diff --git a/config/bliss_audio.mk b/config/bliss_audio.mk
new file mode 100644
index 0000000..7e9fd65
--- /dev/null
+++ b/config/bliss_audio.mk
@@ -0,0 +1,24 @@
+#
+# Bliss Audio Files
+#
+
+ALARM_PATH := vendor/bliss/prebuilt/common/media/audio/alarms
+NOTIFICATION_PATH := vendor/bliss/prebuilt/common/media/audio/notifications
+RINGTONE_PATH := vendor/bliss/prebuilt/common/media/audio/ringtones
+UI_PATH := vendor/bliss/prebuilt/common/media/audio/ui
+
+# Alarms
+PRODUCT_COPY_FILES += \
+ $(ALARM_PATH)/CyanAlarm.ogg:system/media/audio/alarms/CyanAlarm.ogg \
+ $(ALARM_PATH)/NuclearLaunch.ogg:system/media/audio/alarms/NuclearLaunch.ogg
+
+# Notifications
+PRODUCT_COPY_FILES += \
+ $(NOTIFICATION_PATH)/CyanDoink.ogg:system/media/audio/notifications/CyanDoink.ogg \
+ $(NOTIFICATION_PATH)/CyanMail.ogg:system/media/audio/notifications/CyanMail.ogg \
+ $(NOTIFICATION_PATH)/CyanMessage.ogg:system/media/audio/notifications/CyanMessage.ogg \
+ $(NOTIFICATION_PATH)/Laser.ogg:system/media/audio/notifications/Laser.ogg \
+ $(NOTIFICATION_PATH)/Naughty.ogg:system/media/audio/notifications/Naughty.ogg \
+ $(NOTIFICATION_PATH)/Pong.ogg:system/media/audio/notifications/Pong.ogg \
+ $(NOTIFICATION_PATH)/Rang.ogg:system/media/audio/notifications/Rang.ogg \
+ $(NOTIFICATION_PATH)/Stone.ogg:system/media/audio/notifications/Stone.ogg
diff --git a/config/bliss_audio_mod.mk b/config/bliss_audio_mod.mk
new file mode 100644
index 0000000..a86095a
--- /dev/null
+++ b/config/bliss_audio_mod.mk
@@ -0,0 +1,37 @@
+# Copyright (C) 2015 BOSP
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# V4A files
+ifeq (viper, $(BLISS_AUDIO_MOD))
+PRODUCT_COPY_FILES += \
+ vendor/bliss/prebuilt/V4A/etc/audio_effects.conf:system/etc/audio_effects.conf \
+ vendor/bliss/prebuilt/V4A/etc/audio_policy.conf:system/etc/audio_policy.conf \
+ vendor/bliss/prebuilt/V4A/lib/soundfx/libaudiopreprocessing.so:system/lib/soundfx/libaudiopreprocessing.so \
+ vendor/bliss/prebuilt/V4A/lib/soundfx/libbundlewrapper.so:system/lib/soundfx/libbundlewrapper.so \
+ vendor/bliss/prebuilt/V4A/lib/soundfx/libdownmix.so:system/lib/soundfx/libdownmix.so \
+ vendor/bliss/prebuilt/V4A/lib/soundfx/libeffectproxy.so:system/lib/soundfx/libeffectproxy.so \
+ vendor/bliss/prebuilt/V4A/lib/soundfx/libfmas.so:system/lib/soundfx/libfmas.so \
+ vendor/bliss/prebuilt/V4A/lib/soundfx/libldnhncr.so:system/lib/soundfx/libldnhncr.so \
+ vendor/bliss/prebuilt/V4A/lib/soundfx/libqcomvoiceprocessing.so:system/lib/soundfx/libqcomvoiceprocessing.so \
+ vendor/bliss/prebuilt/V4A/lib/soundfx/libreverbwrapper.so:system/lib/soundfx/libreverbwrapper.so \
+ vendor/bliss/prebuilt/V4A/lib/soundfx/libv4a_fx_ics.so:system/lib/soundfx/libv4a_fx_ics.so \
+ vendor/bliss/prebuilt/V4A/lib/soundfx/libvisualizer.so:system/lib/soundfx/libvisualizer.so \
+ vendor/bliss/prebuilt/V4A/priv-app/ViPER4Android/ViPER4Android.apk:system/priv-app/ViPER4Android/ViPER4Android.apk \
+ vendor/bliss/prebuilt/V4A/vendor/etc/audio_effects.conf:system/vendor/etc/audio_effects.conf
+else
+# AudioFX
+PRODUCT_PACKAGES += \
+ AudioFX
+endif
+
diff --git a/config/common.mk b/config/common.mk
index a0c7346..7e9ba02 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -26,25 +26,34 @@
# Backup Tool
PRODUCT_COPY_FILES += \
- vendor/slim/prebuilt/common/bin/backuptool.sh:install/bin/backuptool.sh \
- vendor/slim/prebuilt/common/bin/backuptool.functions:install/bin/backuptool.functions \
- vendor/slim/prebuilt/common/bin/50-slim.sh:system/addon.d/50-slim.sh
+ vendor/bliss/prebuilt/common/bin/backuptool.sh:install/bin/backuptool.sh \
+ vendor/bliss/prebuilt/common/bin/backuptool.functions:install/bin/backuptool.functions \
+ vendor/bliss/prebuilt/common/bin/50-bliss.sh:system/addon.d/50-bliss.sh \
+ vendor/bliss/prebuilt/common/bin/blacklist:system/addon.d/blacklist
# Signature compatibility validation
PRODUCT_COPY_FILES += \
- vendor/slim/prebuilt/common/bin/otasigcheck.sh:install/bin/otasigcheck.sh
+ vendor/bliss/prebuilt/common/bin/otasigcheck.sh:install/bin/otasigcheck.sh
-# SLIM-specific init file
+# Bliss-specific init file
PRODUCT_COPY_FILES += \
- vendor/slim/prebuilt/common/etc/init.local.rc:root/init.slim.rc
+ vendor/bliss/prebuilt/common/etc/init.local.rc:root/init.bliss.rc
+
+# AdAway App
+PRODUCT_COPY_FILES += \
+ vendor/bliss/prebuilt/AdAway/AdAway.apk:system/priv-app/AdAway/AdAway.apk
+
+# KernelAdiutor
+PRODUCT_COPY_FILES += \
+ vendor/bliss/prebuilt/KernelAdiutor/KernelAdiutor.apk:system/app/KernelAdiutor/KernelAdiutor.apk
# Copy latinime for gesture typing
PRODUCT_COPY_FILES += \
- vendor/slim/prebuilt/common/lib/libjni_latinimegoogle.so:system/lib/libjni_latinimegoogle.so
+ vendor/bliss/prebuilt/common/lib/libjni_latinimegoogle.so:system/lib/libjni_latinimegoogle.so
# SELinux filesystem labels
PRODUCT_COPY_FILES += \
- vendor/slim/prebuilt/common/etc/init.d/50selinuxrelabel:system/etc/init.d/50selinuxrelabel
+ vendor/bliss/prebuilt/common/etc/init.d/50selinuxrelabel:system/etc/init.d/50selinuxrelabel
# Enable SIP+VoIP on all targets
PRODUCT_COPY_FILES += \
@@ -52,13 +61,17 @@
# Don't export PS1 in /system/etc/mkshrc.
PRODUCT_COPY_FILES += \
- vendor/slim/prebuilt/common/etc/mkshrc:system/etc/mkshrc \
- vendor/slim/prebuilt/common/etc/sysctl.conf:system/etc/sysctl.conf
+ vendor/bliss/prebuilt/common/etc/mkshrc:system/etc/mkshrc \
+ vendor/bliss/prebuilt/common/etc/sysctl.conf:system/etc/sysctl.conf
PRODUCT_COPY_FILES += \
- vendor/slim/prebuilt/common/etc/init.d/00banner:system/etc/init.d/00banner \
- vendor/slim/prebuilt/common/etc/init.d/90userinit:system/etc/init.d/90userinit \
- vendor/slim/prebuilt/common/bin/sysinit:system/bin/sysinit
+ vendor/bliss/prebuilt/common/etc/init.d/00banner:system/etc/init.d/00banner \
+ vendor/bliss/prebuilt/common/etc/init.d/90userinit:system/etc/init.d/90userinit \
+ vendor/bliss/prebuilt/common/bin/sysinit:system/bin/sysinit
+
+
+# Bliss Audio Mods
+-include vendor/bliss/config/bliss_audio_mod.mk
# Required packages
PRODUCT_PACKAGES += \
@@ -73,9 +86,9 @@
LiveWallpapersPicker \
PhaseBeam
-# AudioFX
+# Other packages
PRODUCT_PACKAGES += \
- AudioFX
+ BlissOTA
# CM Hardware Abstraction Framework
PRODUCT_PACKAGES += \
@@ -86,10 +99,7 @@
PRODUCT_PACKAGES += \
SlimLauncher \
LatinIME \
- BluetoothExt \
- DashClock
-
-# SlimFileManager removed until updated
+ BluetoothExt
# Extra tools
PRODUCT_PACKAGES += \
@@ -113,10 +123,10 @@
media.sf.omx-plugin=libffmpeg_omx.so \
media.sf.extractor-plugin=libffmpeg_extractor.so
-# easy way to extend to add more packages
--include vendor/extra/product.mk
+PRODUCT_PACKAGE_OVERLAYS += vendor/bliss/overlay/common
-PRODUCT_PACKAGE_OVERLAYS += vendor/slim/overlay/common
+# by default, do not update the recovery with system updates
+PRODUCT_PROPERTY_OVERRIDES += persist.sys.recovery_update=false
# Boot animation include
ifneq ($(TARGET_SCREEN_WIDTH) $(TARGET_SCREEN_HEIGHT),$(space))
@@ -130,7 +140,7 @@
fi )
# get a sorted list of the sizes
-bootanimation_sizes := $(subst .zip,, $(shell ls vendor/slim/prebuilt/common/bootanimation))
+bootanimation_sizes := $(subst .zip,, $(shell ls vendor/bliss/prebuilt/common/bootanimation))
bootanimation_sizes := $(shell echo -e $(subst $(space),'\n',$(bootanimation_sizes)) | sort -rn)
# find the appropriate size and set
@@ -148,56 +158,46 @@
ifeq ($(TARGET_BOOTANIMATION_HALF_RES),true)
PRODUCT_COPY_FILES += \
- vendor/slim/prebuilt/common/bootanimation/halfres/$(TARGET_BOOTANIMATION_NAME).zip:system/media/bootanimation.zip
+ vendor/bliss/prebuilt/common/bootanimation/halfres/$(TARGET_BOOTANIMATION_NAME).zip:system/media/bootanimation.zip
else
PRODUCT_COPY_FILES += \
- vendor/slim/prebuilt/common/bootanimation/$(TARGET_BOOTANIMATION_NAME).zip:system/media/bootanimation.zip
+ vendor/bliss/prebuilt/common/bootanimation/$(TARGET_BOOTANIMATION_NAME).zip:system/media/bootanimation.zip
endif
endif
-# Versioning System
-# SlimLP first version.
-PRODUCT_VERSION_MAJOR = 6.0
-PRODUCT_VERSION_MINOR = alpha
-PRODUCT_VERSION_MAINTENANCE = 0.1
-ifdef SLIM_BUILD_EXTRA
- SLIM_POSTFIX := -$(SLIM_BUILD_EXTRA)
-endif
-ifndef SLIM_BUILD_TYPE
- SLIM_BUILD_TYPE := UNOFFICIAL
- PLATFORM_VERSION_CODENAME := UNOFFICIAL
-endif
-
-ifeq ($(SLIM_BUILD_TYPE),DM)
- SLIM_POSTFIX := -$(shell date +"%Y%m%d")
-endif
-
-ifndef SLIM_POSTFIX
- SLIM_POSTFIX := -$(shell date +"%Y%m%d-%H%M")
-endif
-
-PLATFORM_VERSION_CODENAME := $(SLIM_BUILD_TYPE)
-
-# SlimIRC
-# export INCLUDE_SLIMIRC=1 for unofficial builds
-ifneq ($(filter WEEKLY OFFICIAL,$(SLIM_BUILD_TYPE)),)
- INCLUDE_SLIMIRC = 1
-endif
-
-ifneq ($(INCLUDE_SLIMIRC),)
- PRODUCT_PACKAGES += SlimIRC
-endif
-
-# Set all versions
-SLIM_VERSION := Slim-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)-$(SLIM_BUILD_TYPE)$(SLIM_POSTFIX)
-SLIM_MOD_VERSION := Slim-$(SLIM_BUILD)-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)-$(SLIM_BUILD_TYPE)$(SLIM_POSTFIX)
+# BLISS Versioning System
+-include vendor/bliss/config/versions.mk
PRODUCT_PROPERTY_OVERRIDES += \
BUILD_DISPLAY_ID=$(BUILD_ID) \
- slim.ota.version=$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE) \
- ro.slim.version=$(SLIM_VERSION) \
- ro.modversion=$(SLIM_MOD_VERSION) \
- ro.slim.buildtype=$(SLIM_BUILD_TYPE)
+ ro.bliss.version=$(BLISS_VERSION)
-EXTENDED_POST_PROCESS_PROPS := vendor/slim/tools/slim_process_props.py
+# Team Bliss OTA Updater
+ifeq ($(BLISS_DONATE),)
+ BLISS_DONATE =:
+endif
+BLISS_OTA_BUILDDIR := Official
+ifeq ($(BLISS_BUILDTYPE),NIGHTLY)
+ BLISS_OTA_BUILDDIR := Nightlies
+endif
+BLISS_BASE_URL := http://downloads.blissroms.com/Bliss
+ifeq ($(BLISS_DEVICE_URL),)
+ BLISS_DEVICE_URL := $(BLISS_BASE_URL)/$(BLISS_OTA_BUILDDIR)/$(TARGET_DEVICE)
+endif
+BLISS_OTA_VERSION := $(shell date +%Y%m%d%H)
+BLISS_ROM_NAME := Bliss
+PRODUCT_PROPERTY_OVERRIDES += \
+ ro.ota.systemname=$(BLISS_ROM_NAME) \
+ ro.ota.version=$(BLISS_OTA_VERSION) \
+ ro.ota.device=$(TARGET_DEVICE) \
+ ro.ota.manifest=$(BLISS_DEVICE_URL)/ota$(BLISS_OTA_XMLVER).xml
+
+export BLISS_OTA_ROM=$(BLISS_ROM_NAME)
+export BLISS_OTA_VERNAME=$(BLISS_VERSION)
+export BLISS_OTA_VER=$(BLISS_OTA_VERSION)
+export BLISS_OTA_URL=$(BLISS_DEVICE_URL)/$(BLISS_VERSION).zip
+
+EXTENDED_POST_PROCESS_PROPS := vendor/bliss/tools/bliss_process_props.py
+
+$(call prepend-product-if-exists, vendor/extra/product.mk)
diff --git a/config/common_apn.mk b/config/common_apn.mk
index e9ab4fe..887716b 100644
--- a/config/common_apn.mk
+++ b/config/common_apn.mk
@@ -1,8 +1,8 @@
# World APN list
PRODUCT_COPY_FILES += \
- vendor/slim/prebuilt/common/etc/apns-conf.xml:system/etc/apns-conf.xml
+ vendor/bliss/prebuilt/common/etc/apns-conf.xml:system/etc/apns-conf.xml
# Selective SPN list for operator number who has the problem.
PRODUCT_COPY_FILES += \
- vendor/slim/prebuilt/common/etc/selective-spn-conf.xml:system/etc/selective-spn-conf.xml
+ vendor/bliss/prebuilt/common/etc/selective-spn-conf.xml:system/etc/selective-spn-conf.xml
diff --git a/config/common_full.mk b/config/common_full.mk
new file mode 100644
index 0000000..981bdab
--- /dev/null
+++ b/config/common_full.mk
@@ -0,0 +1,9 @@
+# Inherit common Bliss stuff
+$(call inherit-product, vendor/bliss/config/common.mk)
+
+# Include Bliss audio files
+include vendor/bliss/config/bliss_audio.mk
+
+# Extra tools in Bliss
+PRODUCT_PACKAGES += \
+ wget
diff --git a/config/common_full_hybrid_wifionly.mk b/config/common_full_hybrid_wifionly.mk
index 5ab1629..9b29646 100644
--- a/config/common_full_hybrid_wifionly.mk
+++ b/config/common_full_hybrid_wifionly.mk
@@ -1,7 +1,8 @@
# Inherit common stuff
-$(call inherit-product, vendor/slim/config/common.mk)
+$(call inherit-product, vendor/bliss/config/common.mk)
+$(call inherit-product, vendor/bliss/config/common_full.mk)
-PRODUCT_PACKAGE_OVERLAYS += vendor/slim/overlay/tablet
+PRODUCT_PACKAGE_OVERLAYS += vendor/bliss/overlay/tablet
# BT config
PRODUCT_COPY_FILES += \
diff --git a/config/common_full_phone.mk b/config/common_full_phone.mk
index 391ff78..b3e6a13 100644
--- a/config/common_full_phone.mk
+++ b/config/common_full_phone.mk
@@ -1,6 +1,7 @@
# Inherit common stuff
-$(call inherit-product, vendor/slim/config/common.mk)
-$(call inherit-product, vendor/slim/config/common_apn.mk)
+$(call inherit-product, vendor/bliss/config/common.mk)
+$(call inherit-product, vendor/bliss/config/common_full.mk)
+$(call inherit-product, vendor/bliss/config/common_apn.mk)
# SIM Toolkit
PRODUCT_PACKAGES += \
diff --git a/config/common_full_tablet_lte.mk b/config/common_full_tablet_lte.mk
index b253389..fe25cac 100644
--- a/config/common_full_tablet_lte.mk
+++ b/config/common_full_tablet_lte.mk
@@ -1,3 +1,4 @@
# Inherit common stuff
-$(call inherit-product, vendor/slim/config/common.mk)
-$(call inherit-product, vendor/slim/config/common_apn.mk)
+$(call inherit-product, vendor/bliss/config/common.mk)
+$(call inherit-product, vendor/bliss/config/common_full.mk)
+$(call inherit-product, vendor/bliss/config/common_apn.mk)
diff --git a/config/common_full_tablet_wifionly.mk b/config/common_full_tablet_wifionly.mk
index 0efa76f..54648f2 100644
--- a/config/common_full_tablet_wifionly.mk
+++ b/config/common_full_tablet_wifionly.mk
@@ -1,2 +1,3 @@
# Inherit common stuff
-$(call inherit-product, vendor/slim/config/common.mk)
+$(call inherit-product, vendor/bliss/config/common.mk)
+$(call inherit-product, vendor/bliss/config/common_full.mk)
diff --git a/config/nfc_enhanced.mk b/config/nfc_enhanced.mk
index 74165f1..5c9d7dd 100644
--- a/config/nfc_enhanced.mk
+++ b/config/nfc_enhanced.mk
@@ -1,3 +1,3 @@
# This device supports CM enhanced NFC
PRODUCT_COPY_FILES += \
- vendor/slim/config/permissions/com.cyanogenmod.nfc.enhanced.xml:system/etc/permissions/com.cyanogenmod.nfc.enhanced.xml
+ vendor/bliss/config/permissions/com.cyanogenmod.nfc.enhanced.xml:system/etc/permissions/com.cyanogenmod.nfc.enhanced.xml
diff --git a/config/versions.mk b/config/versions.mk
new file mode 100644
index 0000000..8cee25e
--- /dev/null
+++ b/config/versions.mk
@@ -0,0 +1,42 @@
+# Versioning System For Bliss
+# Bliss RELEASE VERSION
+BLISS_VERSION_MAJOR = 5
+BLISS_VERSION_MINOR = 0
+BLISS_VERSION_MAINTENANCE =
+
+VERSION := $(BLISS_VERSION_MAJOR).$(BLISS_VERSION_MINOR)$(BLISS_VERSION_MAINTENANCE)
+
+# Set BLISS_BUILDTYPE
+ifdef BLISS_NIGHTLY
+ BLISS_BUILDTYPE := NIGHTLY
+endif
+ifdef BLISS_EXPERIMENTAL
+ BLISS_BUILDTYPE := EXPERIMENTAL
+endif
+ifdef BLISS_RELEASE
+ BLISS_BUILDTYPE := RELEASE
+endif
+# Set Unofficial if no buildtype set (Buildtype should ONLY be set by BLISS Devs!)
+ifdef BLISS_BUILDTYPE
+else
+ BLISS_BUILDTYPE := UNOFFICIAL
+ BLISS_VERSION_MAJOR := 5
+ BLISS_VERSION_MINOR := 0
+endif
+
+# Set BLISS version
+ifdef BLISS_RELEASE
+ BLISS_VERSION := Bliss-v$(VERSION)
+else
+ BLISS_VERSION := Bliss-v$(VERSION)-$(BLISS_BUILD)-$(BLISS_BUILDTYPE)-$(shell date +%Y%m%d-%H%M)
+endif
+
+BLISS_DISPLAY_VERSION := $(VERSION)
+BLISS_DISPLAY_BUILDTYPE := $(BLISS_BUILDTYPE)
+
+PRODUCT_PROPERTY_OVERRIDES += \
+ ro.modversion=$(BLISS_DISPLAY_VERSION) \
+ ro.bliss.display.version=$(BLISS_DISPLAY_VERSION) \
+ ro.bliss.display.buildtype=$(BLISS_DISPLAY_BUILDTYPE)
+
+export BLISS_OTA_XMLVER=$(BLISS_VERSION_MAJOR)