Merge "Bliss: Rearrangement and Bliss Setup" into n7.1-caf
diff --git a/common.mk b/config/common.mk
similarity index 68%
rename from common.mk
rename to config/common.mk
index c2ec958..f5f3556 100644
--- a/common.mk
+++ b/config/common.mk
@@ -16,31 +16,24 @@
# Thank you, please drive thru!
PRODUCT_PROPERTY_OVERRIDES += persist.sys.dun.override=0
-# Backup Tool
-#PRODUCT_COPY_FILES += \
- vendor/aosp/prebuilt/common/bin/backuptool.sh:install/bin/backuptool.sh \
- vendor/aosp/prebuilt/common/bin/backuptool.functions:install/bin/backuptool.functions \
- vendor/aosp/prebuilt/common/bin/blacklist:system/addon.d/blacklist \
- vendor/aosp/prebuilt/common/bin/whitelist:system/addon.d/whitelist \
-
# Bootanimation
PRODUCT_COPY_FILES += \
- vendor/aosp/prebuilt/common/media/bootanimation.zip:system/media/bootanimation.zip
+ vendor/bliss/prebuilt/common/media/bootanimation.zip:system/media/bootanimation.zip
# init.d support
PRODUCT_COPY_FILES += \
- vendor/aosp/prebuilt/common/bin/sysinit:system/bin/sysinit \
- vendor/aosp/prebuilt/common/etc/init.d/00banner:system/etc/init.d/00banner \
- vendor/aosp/prebuilt/common/etc/init.d/90userinit:system/etc/init.d/90userinit
+ vendor/bliss/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
# Init file
PRODUCT_COPY_FILES += \
- vendor/aosp/prebuilt/common/etc/init.local.rc:root/init.local.rc
+ vendor/bliss/prebuilt/common/etc/init.bliss.rc:root/init.bliss.rc
# Bring in camera effects
PRODUCT_COPY_FILES += \
- vendor/aosp/prebuilt/common/media/LMprec_508.emd:system/media/LMprec_508.emd \
- vendor/aosp/prebuilt/common/media/PFFprec_600.emd:system/media/PFFprec_600.emd
+ vendor/bliss/prebuilt/common/media/LMprec_508.emd:system/media/LMprec_508.emd \
+ vendor/bliss/prebuilt/common/media/PFFprec_600.emd:system/media/PFFprec_600.emd
# Enable SIP+VoIP on all targets
PRODUCT_COPY_FILES += \
@@ -108,22 +101,22 @@
# World APN list
PRODUCT_COPY_FILES += \
- vendor/aosp/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/aosp/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
PRODUCT_PACKAGE_OVERLAYS += \
- vendor/aosp/overlay/common
+ vendor/bliss/overlay/common
# Proprietary latinime libs needed for Keyboard swyping
ifneq ($(filter arm64,$(TARGET_ARCH)),)
PRODUCT_COPY_FILES += \
- vendor/aosp/prebuilt/common/lib/libjni_latinime.so:system/lib/libjni_latinime.so
+ vendor/bliss/prebuilt/common/lib/libjni_latinime.so:system/lib/libjni_latinime.so
else
PRODUCT_COPY_FILES += \
- vendor/aosp/prebuilt/common/lib64/libjni_latinime.so:system/lib64/libjni_latinime.so
+ vendor/bliss/prebuilt/common/lib64/libjni_latinime.so:system/lib64/libjni_latinime.so
endif
# by default, do not update the recovery with system updates
diff --git a/config/versions.mk b/config/versions.mk
new file mode 100644
index 0000000..da94b09
--- /dev/null
+++ b/config/versions.mk
@@ -0,0 +1,38 @@
+# Versioning System For Bliss
+# Bliss RELEASE VERSION
+BLISS_VERSION_MAJOR = 7
+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_MAINTENANCE
+ BLISS_BUILDTYPE := MAINTENANCE
+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 := 7
+ 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.bliss.version=$(BLISS_DISPLAY_VERSION)
diff --git a/prebuilt/common/bin/backuptool.sh b/prebuilt/common/bin/backuptool.sh
index 8a6e7a5..1e7867b 100644
--- a/prebuilt/common/bin/backuptool.sh
+++ b/prebuilt/common/bin/backuptool.sh
@@ -5,7 +5,7 @@
export C=/tmp/backupdir
export S=/system
-export V=6.0
+export V=7.0
# Scripts in /system/addon.d expect to find backuptool.functions in /tmp
cp -f /tmp/install/bin/backuptool.functions /tmp
diff --git a/prebuilt/common/etc/init.local.rc b/prebuilt/common/etc/init.bliss.rc
similarity index 100%
rename from prebuilt/common/etc/init.local.rc
rename to prebuilt/common/etc/init.bliss.rc
diff --git a/prebuilt/common/etc/init.d/00banner b/prebuilt/common/etc/init.d/00banner
index c028585..ea95119 100644
--- a/prebuilt/common/etc/init.d/00banner
+++ b/prebuilt/common/etc/init.d/00banner
@@ -2,6 +2,6 @@
#
# Print startup info
#
-L="log -p i -t aosp"
+L="log -p i -t bliss"
-$L "Welcome to Android `getprop ro.build.version.release` / The Android Open Source Project";
+$L "Welcome to Android `getprop ro.build.version.release` / Bliss-getprop ro.bliss.version";
diff --git a/sepolicy/qcom/sepolicy.mk b/sepolicy/qcom/sepolicy.mk
index 811654a..fd4da4c 100644
--- a/sepolicy/qcom/sepolicy.mk
+++ b/sepolicy/qcom/sepolicy.mk
@@ -1,2 +1,2 @@
BOARD_SEPOLICY_DIRS += \
- vendor/aosp/sepolicy/qcom
+ vendor/bliss/sepolicy/qcom
diff --git a/sepolicy/sepolicy.mk b/sepolicy/sepolicy.mk
index a87c033..0a53894 100644
--- a/sepolicy/sepolicy.mk
+++ b/sepolicy/sepolicy.mk
@@ -1,7 +1,7 @@
#
# This policy configuration will be used by all products that
-# inherit from CM
+# inherit from bliss
#
BOARD_SEPOLICY_DIRS += \
- vendor/aosp/sepolicy
+ vendor/bliss/sepolicy