Merge changes from topic "aboutbliss" into q10
* changes:
config: Build AboutBliss
prebuilt: Add AboutBliss App
diff --git a/config/bliss_packages.mk b/config/bliss_packages.mk
index 0fa617a..98abc1c 100644
--- a/config/bliss_packages.mk
+++ b/config/bliss_packages.mk
@@ -21,7 +21,7 @@
vim \
wget \
zip
-
+
# Filesystems tools
PRODUCT_PACKAGES += \
fsck.exfat \
@@ -60,4 +60,5 @@
BlissUpdater \
BlissPapers \
Launcher3 \
- Launcher3QuickStep
+ Launcher3QuickStep \
+ AboutBliss
diff --git a/prebuilt/common/Android.mk b/prebuilt/common/Android.mk
index 6450d49..b95110d 100644
--- a/prebuilt/common/Android.mk
+++ b/prebuilt/common/Android.mk
@@ -47,3 +47,14 @@
LOCAL_MODULE_CLASS := APPS
LOCAL_MODULE_SUFFIX := .apk
include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := AboutBliss
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := app/$(LOCAL_MODULE).apk
+LOCAL_CERTIFICATE := PRESIGNED
+LOCAL_MODULE_CLASS := APPS
+LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
+LOCAL_DEX_PREOPT := false
+LOCAL_PRODUCT_MODULE := true
+include $(BUILD_PREBUILT)
diff --git a/prebuilt/common/app/AboutBliss.apk b/prebuilt/common/app/AboutBliss.apk
new file mode 100644
index 0000000..cebff90
--- /dev/null
+++ b/prebuilt/common/app/AboutBliss.apk
Binary files differ