Merge "remove Camera from required packages" into kk4.4
diff --git a/config/common.mk b/config/common.mk
index de490c9..7b18d52 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -40,6 +40,10 @@
PRODUCT_COPY_FILES += \
vendor/slim/prebuilt/common/lib/libjni_latinime.so:system/lib/libjni_latinime.so
+# Copy libgif for Nova Launcher 3.0
+PRODUCT_COPY_FILES += \
+ vendor/slim/prebuilt/common/lib/libgif.so:system/lib/libgif.so
+
# SELinux filesystem labels
PRODUCT_COPY_FILES += \
vendor/slim/prebuilt/common/etc/init.d/50selinuxrelabel:system/etc/init.d/50selinuxrelabel
@@ -93,7 +97,6 @@
SlimCenter \
SlimFileManager \
LatinIME \
- SlimIRC \
BluetoothExt \
DashClock
@@ -153,9 +156,9 @@
# Versioning System
# KitKat SlimKat freeze code
-PRODUCT_VERSION_MAJOR = 4.4.2
+PRODUCT_VERSION_MAJOR = 4.4.4
PRODUCT_VERSION_MINOR = build
-PRODUCT_VERSION_MAINTENANCE = 5.2
+PRODUCT_VERSION_MAINTENANCE = 5.95
ifdef SLIM_BUILD_EXTRA
SLIM_POSTFIX := -$(SLIM_BUILD_EXTRA)
endif
@@ -165,6 +168,16 @@
SLIM_POSTFIX := -$(shell date +"%Y%m%d-%H%M")
endif
+# 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)
@@ -173,5 +186,6 @@
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.modversion=$(SLIM_MOD_VERSION) \
+ ro.slim.buildtype=$(SLIM_BUILD_TYPE)
diff --git a/prebuilt/common/app/NovaLauncher.apk b/prebuilt/common/app/NovaLauncher.apk
index a6f6913..e88ae8c 100644
--- a/prebuilt/common/app/NovaLauncher.apk
+++ b/prebuilt/common/app/NovaLauncher.apk
Binary files differ
diff --git a/prebuilt/common/lib/libgif.so b/prebuilt/common/lib/libgif.so
new file mode 100644
index 0000000..4ec3964
--- /dev/null
+++ b/prebuilt/common/lib/libgif.so
Binary files differ
diff --git a/vendorsetup.sh b/vendorsetup.sh
index db0c0d1..e24e09c 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -23,6 +23,7 @@
add_lunch_combo slim_i9100g-userdebug
add_lunch_combo slim_i925-userdebug
add_lunch_combo slim_i9300-userdebug
+add_lunch_combo slim_i9500-userdebug
add_lunch_combo slim_jflte-userdebug
add_lunch_combo slim_ls980-userdebug
add_lunch_combo slim_m7-userdebug
@@ -56,4 +57,4 @@
add_lunch_combo slim_xt925-userdebug
add_lunch_combo slim_xt926-userdebug
add_lunch_combo slim_yuga-userdebug
-
+add_lunch_combo slim_pyramid-userdebug