Can now build AROMA version

2025-11-08 07:54:31 +00:00 · 2015-06-01 17:55:04 +02:00
parent 32e7a83006
commit bbe21cd987
68 changed files with 1107 additions and 2 deletions
@@ -0,0 +1,69 @@
+### LICENSE:
+#
+# Copyright (C) 2011 Ahmad Amarullah ( http://amarullz.com/ )
+#
+# 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.
+#
+### LANGUAGE STRING RESOURCE FILE
+#
+#   Language  : English
+#   By        : amarullz
+#
+
+#
+#--- COMMON SYSTEM STRING RESOURCE
+#
+text_ok=OK
+text_next=Next
+text_back=Back
+text_yes=Yes
+text_no=No
+text_about=About
+text_calibrating=Calibrating Tools
+text_quit=Quit Installation
+text_quit_msg=Are you sure to quit the installer?
+
+#
+#-- CUSTOM STRING RESOURCE
+#
+common.for=for
+
+langtest.title=Language Test
+langtest.multiline=This text is located in langs/en.lang\
+Use backslash before enter to add new line\
+\
+You can also do <b>Formatting</b> inside the language string resource.\
+\
+Thanks for using AROMA Installer
+
+#-- End of string without any backslash for multiline text
+
+
+themes.title=Select Theme
+themes.desc=Please select installer theme that you want to use in this installation test:
+
+welcome.title=Welcome
+welcome.text1=You are about to Installing
+welcome.text2=AROMA Installer was the first and the only Touch and Customizable ANDROID ROM Installer in the World.
+welcome.version=VERSION
+welcome.codename=CODENAME
+welcome.updated=UPDATED
+welcome.next=Press Next to Continue the Installation...
+
+terms.title=Terms and Conditions
+terms.desc=Please read carefully The AROMA Installer Terms and Conditions Below.
+terms.check=I Agree with this Terms and Conditions...
+terms.confirm=Please check the agreement...
+
+changelog.title=Changelog
+changelog.desc=AROMA Installer Changelog
@@ -0,0 +1,7 @@
+#!/sbin/sh
+#
+#Duplicate props
+#by raulx222
+#
+
+cp /tmp/aroma/aromagapps.prop /tmp/aroma/gapps.prop
@@ -0,0 +1,27 @@
+#!/sbin/sh
+#
+#Open GApps Tools
+#by raulx222
+#
+
+case "$1" in
+	save)
+	rm -f /sdcard/Open-GApps/aromagapps.prop
+	rm -f /sdcard/Open-GApps/bypass.prop
+	rm -f /sdcard/Open-GApps/rem.prop
+	[ ! -d /sdcard/Open-GApps ] && mkdir /sdcard/Open-GApps
+	cp /tmp/aroma/aromagapps.prop /sdcard/Open-GApps/aromagapps.prop
+	cp /tmp/aroma/bypass.prop /sdcard/Open-GApps/bypass.prop
+	cp /tmp/aroma/rem.prop /sdcard/Open-GApps/rem.prop
+	;;
+	load)
+	[ -f /sdcard/Open-GApps/aromagapps.prop ] && rm -f /tmp/aroma/aromagapps.prop && cp /sdcard/Open-GApps/aromagapps.prop /tmp/aroma/aromagapps.prop
+	[ -f /sdcard/Open-GApps/bypass.prop ] && rm -f /tmp/aroma/bypass.prop && cp /sdcard/Open-GApps/bypass.prop /tmp/aroma/bypass.prop
+	[ -f /sdcard/Open-GApps/rem.prop ] && rm -f /tmp/aroma/rem.prop && cp /sdcard/Open-GApps/rem.prop /tmp/aroma/rem.prop
+	;;
+	reset)
+	rm -f /tmp/aroma/aromagapps.prop
+	rm -f /tmp/aroma/bypass.prop
+	rm -f /tmp/aroma/rem.prop
+	;;
+esac
@@ -0,0 +1,67 @@
+img.background=background
+img.titlebar=titlebar
+img.navbar=navbar
+img.dialog=dialog
+img.dialog.titlebar=dialog_titlebar
+img.progress=progress_empty.9
+img.prograss.fill=progress_full.9
+img.selection=button_press
+img.selection.push=button_press
+
+img.button=button_rest
+img.button.focus=button_focus
+img.button.push=button_press
+
+img.checkbox=cb
+img.checkbox.focus=cb_sel
+img.checkbox.push=cb_sel
+img.checkbox.on=cb_on
+img.checkbox.on.focus=cb_on_sel
+img.checkbox.on.push=cb_on_sel
+
+img.radio=radio
+img.radio.focus=radio_sel
+img.radio.push=radio_sel
+img.radio.on=radio_on
+img.radio.on.focus=radio_on_sel
+img.radio.on.push=radio_on_sel
+
+
+color.winbg           = #242424
+color.winbg_g         = #242424
+color.winfg           = #f5f5f5
+color.winfg_gray      = #666666
+color.dialogbg        = #242424
+color.dialogbg_g      = #242424
+color.dialogfg        = #ffffff
+color.textbg          = #242424
+color.textfg          = #ffffff
+color.textfg_gray     = #808080
+color.controlbg       = #ececec
+color.controlbg_g     = #bdbdbd
+color.controlfg       = #ffffff
+color.selectbg        = #e6e6e6
+color.selectbg_g      = #ffffff
+color.selectfg        = #ffffff
+color.titlebg         = #2d2d2d
+color.titlebg_g       = #2d2d2d
+color.titlefg         = #ffffff
+color.dlgtitlebg      = #3b3b3b
+color.dlgtitlebg_g    = #1a1a1a
+color.dlgtitlefg      = #ffffff
+color.scrollbar       = #009485
+color.navbg           = #242424
+color.navbg_g         = #242424
+color.border          = #dddddd
+color.border_g        = #dddddd
+color.progressglow    = #e6e6e6
+
+
+config.roundsize             = 1
+config.button_roundsize      = 1
+config.window_roundsize      = 1
+config.transition_frame      = 5
+
+info.themename        = Material
+info.description      = Material Theme for AROMA Installer
+info.author           = Daniiiik49 (modified by raulx222)
@@ -27,6 +27,7 @@ SOURCE=$TOP/sources
 SCRIPTS=$TOP/scripts
 DENSITIES="2 4 6 8" #don't add 0
 VARIANTS="stock full micro mini nano pico" #keep in order from large to small
+AROMAVARIANTS="stock" #add 'stock' or keep empty to not build aroma

 STOCK="cameragoogle
 keyboardgoogle"
@@ -99,6 +100,7 @@ command -v zipalign >/dev/null 2>&1 || { echo "zipalign is required but it's not

 . "$SCRIPTS/inc.buildhelper.sh"
 . "$SCRIPTS/inc.buildtarget.sh"
+. "$SCRIPTS/inc.aromadata.sh"
 . "$SCRIPTS/inc.installdata.sh"
 . "$SCRIPTS/inc.packagetarget.sh"
 buildtarget
@@ -112,3 +114,14 @@ for VARIANT in $VARIANTS; do
 	#smaller variants can't build larger variants
 	SUPPORTEDVARIANTS=$(echo $SUPPORTEDVARIANTS | sed "s/$VARIANT//g")
 done
+
+#ONLY BUILD AROMA AFTER NORMAL VARIANTS, the build-tree will be heavily modified
+SUPPORTEDVARIANTS="$VARIANTS" #notice that aroma can build all 'normal' variants
+for AROMA in $AROMAVARIANTS; do
+	VARIANT="$AROMA"
+	variantscripts
+	aromascripts
+	createzip "aroma"
+	#smaller variants can't build larger variants
+	SUPPORTEDVARIANTS=$(echo $SUPPORTEDVARIANTS | sed "s/$VARIANT//g")
+done
@@ -0,0 +1,903 @@
+#This file is part of The Open GApps script of @mfonville.
+#
+#    The Open GApps scripts are free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    These scripts are distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+tee -a "$build"META-INF/com/google/android/aroma-config > /dev/null <<'EOFILE'
+#This file is part of The Open GApps script of @raulx222.
+#
+#    The Open GApps scripts are free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    These scripts are distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+
+#ROM Info
+ini_set("rom_name", "Open GApps");
+ini_set("rom_author", "Open GApps Team");
+ini_set("rom_date", zipprop("g.prop", "ro.addon.open_version"));
+ini_set("text_quit", "Exit");
+ini_set("text_next", "Next");
+
+##############################################
+#
+#Set colorspace to RGBA in order to obtain proper splash screen colors
+#
+##############################################
+ini_set("force_colorspace", "rgba");
+splash(
+    3000,
+    "open"
+);
+
+
+##############################################
+#
+#Font
+#
+##############################################
+fontresload("0", "ttf/Roboto-Regular.ttf", "12");
+fontresload("1", "ttf/Roboto-Regular.ttf", "14");
+
+
+##############################################
+#
+#UI
+#
+##############################################
+theme("material_green");
+
+
+##############################################
+#
+#Welcome box
+#
+##############################################
+viewbox(
+	"Welcome",
+	
+	"With AROMA Open GApps you can choose which GApps to install!\n\n\n\n" +
+	"Package Information\n\n" +
+
+		"   Name\t\t: <b><#scrollbar>" + ini_get("rom_name") + "</#></b>\n"+
+		"   Author\t\t: <b><#scrollbar>" + ini_get("rom_author") + "</#></b>\n"+
+		"   Supported devices: <b><#scrollbar>Any!</#></b>\n"+
+		"   Supported Android: <b><#scrollbar>"+zipprop("g.prop", "ro.addon.platform")+"</#></b>\n"+
+		"   Build date\t: <b><#scrollbar>" + ini_get("rom_date") + " </#></b>\n\n"+
+		"<b>For support and updates visit the official thread on XDA! <#scrollbar>(bit.ly/opengappsxda)</#></b>"+"\n\n\n\n",
+
+
+	"@welcome"
+);
+##############################################
+#
+# MENU
+#
+##############################################
+menubox(
+  #-- Title
+    "Open GApps",
+  
+  #-- Sub Title
+    "Please select one of the choices below",
+  
+  #-- Icon
+    "@apps",
+    
+  #-- Will be saved in /tmp/aroma/demo.prop
+    "menu.prop",
+    
+  #-------------------------+-----------------[ Menubox Items ]-------------------------+---------------#
+  # TITLE                   |  SUBTITLE                                                 |   Item Icons  #
+  #-------------------------+-----------------------------------------------------------+---------------#
+  
+    "Customized installation",      "Select yourself which GApps to install",       "@personalize",      #-- selected = 1
+    "Complete installation",       "Install complete GApps package",                "@default",         #-- selected = 2
+    "Exit",              "Exit to recovery",    "@alert"      #-- selected = 3
+);
+
+#Exit
+if prop("menu.prop", "selected")=="3" then
+	if
+		confirm(
+			"Exit",
+			"Are you sure want to exit the Installer?",
+			"@alert"
+		)=="yes"
+	then
+		exit("");
+	endif;
+
+	back("1");
+endif;
+
+##############################################
+#
+#Load selections from previous installation
+#
+##############################################
+checkviewbox(
+	"Load selections",
+	"Load selections from the previous installation\n\n\n\n\n<b>Do you want to load the selections from the previous installation?</b>\n\n",
+	"@welcome",
+
+	"Load selections.", "1", "loadselections"
+);
+
+if
+		getvar("loadselections")=="1" 
+	then
+		resexec("scripts/tools.sh", "load");
+		setvar("reset", "1");
+	else
+		if
+			getvar("reset")=="1" then
+				resexec("scripts/tools.sh", "reset");
+				setvar("reset","0");
+		endif;
+endif;
+
+if prop("menu.prop", "selected")=="1" then
+##############################################
+#
+#Customized installation
+#
+##############################################
+
+
+form(
+    "Apps",
+    "Please select which GApps you want to add on include/exclude list</#>",
+    "@default",
+    aromagapps.prop,
+  #
+  # Type:
+  #  - group              = Group
+  #  - select             = Select Item
+  #  - select.selected    = Selected Select Item
+  #  - check              = Checkbox Item
+  #  - check.checked      = Checked Checkbox Item
+  #  - hide               = Hidden
+  #
+  #-------------+-----------------------[ Selectbox Without Group ]------------------------------#
+  # PROP ID     | TITLE            |  SUBTITLE                                   |    Type       #
+  #-------------+--------+-------------------------------------------------------+---------------#
+    "inclorexcl",     "Choose to include or exclude the apps below",        "",                                         "group",
+	"1",     "Include",        "Choose the apps you WANT installed from the list below.",                                         "select.selected",
+	"0",     "Exclude",        "Choose the apps you DON'T WANT installed from the list below.",                                         "select",
+
+    "gapps",     "Choose GApps which you want to add on install/exclude list",        "",                                         "group",
+      "Books",     "<b>Books</b>",       "To Exclude/Include Google Play Books [Stock/Full]",                      "check",
+      "CalendarGoogle",     "<b>CalendarGoogle </b>",       "To Exclude/Include Google Calendar [Stock/Full/Mini/Micro]",                      "check",
+	  "CalSync",     "<b>CalSync</b>",       "To Exclude/Include Google Calendar Sync (installed by default when Google Calendar is NOT being installed) [Stock/Full/Mini/Micro/Nano/Pico]",                      "check",
+      "CameraGoogle",     "<b>CameraGoogle</b>",       "To Exclude/Include Google Camera [Stock]",                      "check",
+      "Chrome",     "<b>Chrome</b>",       "To Exclude/Include Chrome Browser [Stock/Full]",                      "check",
+      "CloudPrint",     "<b>CloudPrint</b>",       "To Exclude/Include Cloud Print [Stock/Full]",                      "check",
+      "Docs",     "<b>Docs</b>",       "To Exclude/Include Google Docs [Stock/Full]",                      "check",
+      "Drive",     "<b>Drive</b>",       "To Exclude/Include Google Drive [Stock/Full]",                      "check",
+      "Ears",     "<b>Ears</b>",       "To Exclude/Include Sound Search for Google Play [Stock/Full]",                      "check",
+      "Earth",     "<b>Earth</b>",       "To Exclude/Include Google Earth [Stock/Full]",                      "check",
+      "ExchangeGoogle",     "<b>ExchangeGoogle</b>",       "To Exclude/Include Google Exchange Services [Stock/Full/Mini/Micro]",                      "check",
+	  "FaceUnlock",     "<b>FaceUnlock</b>",       "To Exclude/Include FaceUnlock [Stock/Full/Mini/Micro]",                      "check",
+	  "Fitness",     "<b>Fitness</b>",       "To Exclude/Include Fitness [Stock/Full]",                      "check",
+	  "Gmail",     "<b>Gmail</b>",       "To Exclude/Include Gmail [Stock/Full/Mini/Micro]",                      "check",
+	  "GoogleNow",     "<b>GoogleNow</b>",       "To Exclude/Include Google Now Launcher [Stock/Full/Mini/Micro]",                      "check",
+	  "GooglePlus",     "<b>GooglePlus</b>",       "To Exclude/Include Google+ [Stock/Full/Mini]",                      "check",
+	  "GoogleTTS",     "<b>GoogleTTS</b>",       "To Exclude/Include Google Text-to-Speech [Stock/Full/Mini/Micro]",                      "check",
+	  "Hangouts",     "<b>Hangouts</b>",       "To Exclude/Include Hangouts [Stock/Full/Mini]",                      "check",
+	  "Keep",     "<b>Keep</b>",       "To Exclude/Include Google Keep [Stock/Full]",                      "check",
+	  "KeyboardGoogle",     "<b>KeyboardGoogle</b>",       "To Exclude/Include Google Keyboard [Stock]",                      "check",
+	  "Maps",     "<b>Maps</b>",       "To Exclude/Include Maps [Stock/Full/Mini]",                      "check",
+	  "Messenger",     "<b>Messenger</b>",       "To Exclude/Include Messenger (not installed on tablet devices) [Stock/Full]",                      "check",
+	  "Movies",     "<b>Movies</b>",       "To Exclude/Include Google Play Movies & TV [Stock/Full]",                      "check",
+	  "Music",     "<b>Music</b>",       "To Exclude/Include Google Play Music [Stock/Full]",                      "check",
+	  "NewsStand",     "<b>NewsStand</b>",       "To Exclude/Include Google Play Newsstand [Stock/Full]",                      "check",
+	  "NewsWidget",     "<b>NewsWidget</b>",       "To Exclude/Include Google News & Weather [Stock/Full]",                      "check",
+	  "PlayGames",     "<b>PlayGames</b>",       "To Exclude/Include Google Play Games [Stock/Full]",                      "check",
+	  "Sheets",     "<b>Sheets</b>",       "To Exclude/Include Google Sheets [Stock]",                      "check",
+	  "Slides",     "<b>Slides</b>",       "To Exclude/Include Google Slides [Stock]",                      "check",
+	  "Search",     "<b>Search</b>",       "To Exclude BOTH Google Search AND Google Now Launcher [S/F/Min/Mic/N] <#f00>OR</#> To Include Google Search [S/F/Min/Mic/N]",                      "check",
+	  "Speech",     "<b>Speech</b>",       "To Exclude/Include off-line Speech files (Required for off-line 'Okay Google' support) [Stock/Full/Mini/Micro/Nano]",                      "check",
+	  "Street",     "<b>Street</b>",       "To Exclude/Include Street View on Google Maps [Stock/Full/Mini]",                      "check",
+	  "Photos",     "<b>Photos</b>",       "To Exclude/Include the Google Photos[Stock/Full/Mini]",                      "check",
+	  "Talkback",     "<b>Talkback</b>",       "To Exclude/Include TalkBack [Stock/Full]",                      "check",
+	  "Wallet",     "<b>Wallet</b>",       "To Exclude/Include Google Wallet [Stock/Full]",                      "check",
+	  "Webview",     "<b>Webview</b>",       "To Exclude/Include Google Webview [Stock/Full]",                      "check",
+	  "YouTube",     "<b>YouTube</b>",       "To Exclude/Include YouTube [Stock/Full/Mini]",                      "check"
+);
+#Duplicate aromagapps.prop and rename it to gapps.prop - this method is useful because the selections doesn't get erased by the complete installation (menu.prop selected ==2)
+resexec("scripts/props.sh");
+endif;
+
+#IF COMPLETE INSTALLATION IS CHOOSEN - reset gapps.prop
+if prop("menu.prop", "selected")=="2" then
+	writetmpfile("gapps.prop", " ");
+endif;
+
+form(
+    "Default removal bypass",
+    "Careful, you can override the default removal of Stock/AOSP applications below. Please only select if you are sure you want them installed alongside the Google replacement.",
+    "@default",
+    bypass.prop,
+  #
+  # Type:
+  #  - group              = Group
+  #  - select             = Select Item
+  #  - select.selected    = Selected Select Item
+  #  - check              = Checkbox Item
+  #  - check.checked      = Checked Checkbox Item
+  #  - hide               = Hidden
+  #
+  #-------------+-----------------------[ Selectbox Without Group ]------------------------------#
+  # PROP ID     | TITLE            |  SUBTITLE                                   |    Type       #
+  #-------------+--------+-------------------------------------------------------+---------------#
+    "bypassrem",     "Bypass the automatic removal of Stock/AOSP apps [Stock ONLY]",        "",                                         "group",
+      "+Browser",     "<b>+Browser</b>",      "To bypass the automatic removal of Stock/AOSP Browser [Stock ONLY]",                      "check",
+	  "+Email",     "<b>+Email</b>",      "To bypass the automatic removal of Stock/AOSP Email Application [Stock ONLY]",                      "check",
+	  "+Gallery",     "<b>+Gallery</b>",      "To bypass the automatic removal of Stock/AOSP Gallery Application [Stock ONLY]",                      "check",
+	  "+Launcher",     "<b>+Launcher</b>",      " To bypass the automatic removal of Stock/AOSP Launcher(s) [Stock ONLY]",                      "check",
+	  "+MMS",     "<b>+MMS</b>",      "To bypass the automatic removal of Stock/AOSP SMS Application [Stock ONLY]",                      "check",
+	  "+PicoTTS",     "<b>+PicoTTS</b>",      "To bypass the automatic removal of the Stock/AOSP PicoTTS app [Stock ONLY]",                      "check"
+);
+
+form(
+    "Remove",
+    "Please select which Stock/AOSP apps you want to add on remove list\n</#>",
+    "@default",
+    rem.prop,
+  #
+  # Type:
+  #  - group              = Group
+  #  - select             = Select Item
+  #  - select.selected    = Selected Select Item
+  #  - check              = Checkbox Item
+  #  - check.checked      = Checked Checkbox Item
+  #  - hide               = Hidden
+  #
+  #-------------+-----------------------[ Selectbox Without Group ]------------------------------#
+  # PROP ID     | TITLE            |  SUBTITLE                                   |    Type       #
+  #-------------+--------+-------------------------------------------------------+---------------#
+    "remove",     "Choose apps which you want to remove",        "",                                         "group",
+	  "BasicDreams",     "<b>BasicDreams</b>",       "To remove the Stock Basic Dreams Wallpaper",                      "check",
+      "Browser",     "<b>Browser</b>",       "To remove the Stock/AOSP Browser",                      "check",
+      "CalendarStock",     "<b>CalendarStock</b>",       "To remove the Stock/AOSP Calendar Application (automatically removed when Google Calendar is installed)",                      "check",
+	  "CameraStock",     "<b>CameraStock</b>",       "To remove the Stock/AOSP Camera Application (automatically removed when Google Camera is installed)",                      "check",
+	  "CMAccount",     "<b>CMAccount</b>",       "To remove the Stock CM Account Application",                      "check",
+      "CMAudioFX",     "<b>CMAudioFX</b>",       "To remove the Stock CM AudioFX Application",                      "check",
+      "CMEleven",     "<b>CMEleven</b>",       "To remove the Stock CM Music Application",                      "check",
+      "CMFileManager",     "<b>CMFileManager</b>",       "To remove the Stock CM File Manager",                      "check",
+	  "CMSetupWizard",     "<b>CMSetupWizard</b>",       "To remove the Stock CM Setup Wizard Application",                      "check",
+	  "CMUpdater",     "<b>CMUpdater</b>",       "To remove the Stock CM Updater Application",                      "check",
+      "CMWallpapers",     "<b>CMWallpapers</b>",       "To remove the Stock CM Wallpapers",                      "check",
+      "DashClock",     "<b>DashClock</b>",       "To remove the Stock DashClock Application (found in certain ROM's)",                      "check",
+      "Email",     "<b>Email</b>",       "To remove the Stock/AOSP Email Application",                      "check",
+      "ExchangeStock",     "<b>ExchangeStock</b>",       "To remove the Stock/AOSP Exchange Services (automatically removed when Google Exchange Services is installed)",                      "check",
+      "FMRadio",     "<b>FMRadio</b>",       "To remove the Stock FM Radio Application (not found on all devices or ROM's)",                      "check",
+	  "Galaxy",     "<b>Galaxy</b>",       "To remove the Stock Galaxy Wallpaper",                      "check",
+	  "Gallery",     "<b>Gallery</b>",       "To remove the Stock/AOSP Gallery",                      "check",
+	  "HoloSpiral",     "<b>HoloSpiral</b>",       "To remove the Stock Holo Spiral Wallpaper",                      "check",
+	  "KeyboardStock",     "<b>KeyboardStock </b>",       "To remove the Stock/AOSP Keyboard (automatically removed when Google Keyboard is installed)",                      "check",
+	  "Launcher",     "<b>Launcher</b>",       "To remove the Stock/AOSP Launcher(s)",                      "check",
+	  "LiveWallpapers",     "<b>LiveWallpapers</b>",       "To remove the Stock Live Wallpapers",                      "check",
+	  "LockClock",     "<b>LockClock</b>",       "To remove the Stock Lock Clock Application",                      "check",
+	  "MMS",     "<b>MMS</b>",       "To remove the Stock/AOSP SMS Application",                      "check",
+	  "NoiseField",     "<b>NoiseField</b>",       "To remove the Stock Noise Field Wallpaper",                      "check",
+	  "Phasebeam",     "<b>Phasebeam</b>",       "To remove the Stock Phasebeam Wallpaper",                      "check",
+	  "PhotoPhase",     "<b>PhotoPhase</b>",       "To remove the Stock Photo Phase Wallpaper",                      "check",
+	  "PhotoTable",     "<b>PhotoTable</b>",       "To remove the Stock Photo Table Wallpaper",                      "check",
+	  "PicoTTS",     "<b>PicoTTS</b>",       "To remove the Stock/AOSP PicoTTS",                      "check",
+	  "SimToolKit",     "<b>SimToolKit</b>",       "To remove the Stock/AOSP SimToolKit Application",                      "check",
+	  "Studio",     "<b>Studio</b>",       "To remove the Stock/AOSP Movie Studio Application",                      "check",
+	  "SykoPath",     "<b>SykoPath</b>",       "To remove SykoPath OverlayManager (found in certain ROM's)",                      "check",
+	  "Terminal",     "<b>Terminal</b>",       "To remove the Stock Terminal Application",                      "check",
+	  "Themes",     "<b>Themes</b>",       "To remove the Stock Themes Application (Will break the link in Settings to Themes)",                      "check",
+	  "VisualizationWallpapers",     "<b>VisualizationWallpapers</b>",       "To remove VisualizationWallpapers",                      "check",
+	  "WhisperPush",     "<b>WhisperPush</b>",       "To remove the Stock WhisperPush support ",                      "check"
+);
+form(
+    "Extra",
+    "Extra Key Words.\n</#>",
+    "@default",
+    extra.prop,
+  #
+  # Type:
+  #  - group              = Group
+  #  - select             = Select Item
+  #  - select.selected    = Selected Select Item
+  #  - check              = Checkbox Item
+  #  - check.checked      = Checked Checkbox Item
+  #  - hide               = Hidden
+  #
+  #-------------+-----------------------[ Selectbox Without Group ]------------------------------#
+  # PROP ID     | TITLE            |  SUBTITLE                                   |    Type       #
+  #-------------+--------+-------------------------------------------------------+---------------#
+    "extra",     "Extra key words.",        "",                                         "group",
+      "ex1",     "<b>NoDebug</b>",       "To disable the debug log.",                      "check",
+      "ex2",     "<b>Test</b>",       "To perform a install simulation and generate a detailed log, but <u>WILL NOT MAKE ANY CHANGES</u> to your device.",                      "check"
+);
+
+##############################################
+#
+#Write the gapps-config file
+#
+##############################################
+setvar("gapps","");
+
+#EXTRA KEY WORDS
+if
+	prop("extra.prop", "ex1")=="1"
+then
+	appendvar("gapps", "NoDebug\n");
+endif;
+if
+	prop("extra.prop", "ex2")=="1"
+then
+	appendvar("gapps", "Test\n");
+endif;
+
+#INCLUDE OR EXCLUDE
+if
+	prop("gapps.prop", "inclorexcl")=="1"
+then
+	appendvar("gapps", "Include");
+else
+	appendvar("gapps", "Exclude");
+endif;
+
+#APPS TO INCLUDE/EXCLUDE
+appendvar("gapps", "\n\n");
+
+if
+	prop("gapps.prop", "Books")=="1"
+then
+	appendvar("gapps", "Books\n");
+endif;
+
+if
+	prop("gapps.prop", "CalendarGoogle")=="1"
+then
+	appendvar("gapps", "CalendarGoogle\n");
+endif;
+
+if
+	prop("gapps.prop", "CalSync")=="1"
+then
+	appendvar("gapps", "CalSync\n");
+endif;
+
+if
+	prop("gapps.prop", "CameraGoogle")=="1"
+then
+	appendvar("gapps", "CameraGoogle\n");
+endif;
+
+if
+	prop("gapps.prop", "Chrome")=="1"
+then
+	appendvar("gapps", "Chrome\n");
+endif;
+
+if
+	prop("gapps.prop", "CloudPrint")=="1"
+then
+	appendvar("gapps", "CloudPrint\n");
+endif;
+
+if
+	prop("gapps.prop", "Docs")=="1"
+then
+	appendvar("gapps", "Docs\n");
+endif;
+
+if
+	prop("gapps.prop", "Drive")=="1"
+then
+	appendvar("gapps", "Drive\n");
+endif;
+
+if
+	prop("gapps.prop", "Ears")=="1"
+then
+	appendvar("gapps", "Ears\n");
+endif;
+
+if
+	prop("gapps.prop", "Earth")=="1"
+then
+	appendvar("gapps", "Earth\n");
+endif;
+
+if
+	prop("gapps.prop", "ExchangeGoogle")=="1"
+then
+	appendvar("gapps", "ExchangeGoogle\n");
+endif;
+
+if
+	prop("gapps.prop", "FaceUnlock")=="1"
+then
+	appendvar("gapps", "FaceUnlock\n");
+endif;
+
+if
+	prop("gapps.prop", "Fitness")=="1"
+then
+	appendvar("gapps", "Fitness\n");
+endif;
+
+if
+	prop("gapps.prop", "Gmail")=="1"
+then
+	appendvar("gapps", "Gmail\n");
+endif;
+
+if
+	prop("gapps.prop", "GoogleNow")=="1"
+then
+	appendvar("gapps", "GoogleNow\n");
+endif;
+
+if
+	prop("gapps.prop", "GooglePlus")=="1"
+then
+	appendvar("gapps", "GooglePlus\n");
+endif;
+
+if
+	prop("gapps.prop", "GoogleTTS")=="1"
+then
+	appendvar("gapps", "GoogleTTS\n");
+endif;
+
+if
+	prop("gapps.prop", "Hangouts")=="1"
+then
+	appendvar("gapps", "Hangouts\n");
+endif;
+
+if
+	prop("gapps.prop", "Keep")=="1"
+then
+	appendvar("gapps", "Keep\n");
+endif;
+
+if
+	prop("gapps.prop", "KeyboardGoogle")=="1"
+then
+	appendvar("gapps", "KeyboardGoogle\n");
+endif;
+
+if
+	prop("gapps.prop", "Maps")=="1"
+then
+	appendvar("gapps", "Maps\n");
+endif;
+
+if
+	prop("gapps.prop", "Messenger")=="1"
+then
+	appendvar("gapps", "Messenger\n");
+endif;
+
+if
+	prop("gapps.prop", "Movies")=="1"
+then
+	appendvar("gapps", "Movies\n");
+endif;
+
+if
+	prop("gapps.prop", "Music")=="1"
+then
+	appendvar("gapps", "Music\n");
+endif;
+
+if
+	prop("gapps.prop", "NewsStand")=="1"
+then
+	appendvar("gapps", "NewsStand\n");
+endif;
+
+if
+	prop("gapps.prop", "NewsWidget")=="1"
+then
+	appendvar("gapps", "NewsWidget\n");
+endif;
+
+if
+	prop("gapps.prop", "PlayGames")=="1"
+then
+	appendvar("gapps", "PlayGames\n");
+endif;
+
+if
+	prop("gapps.prop", "Sheets")=="1"
+then
+	appendvar("gapps", "Sheets\n");
+endif;
+
+if
+	prop("gapps.prop", "Slides")=="1"
+then
+	appendvar("gapps", "Slides\n");
+endif;
+
+if
+	prop("gapps.prop", "Search")=="1"
+then
+	appendvar("gapps", "Search\n");
+endif;
+
+if
+	prop("gapps.prop", "Speech")=="1"
+then
+	appendvar("gapps", "Speech\n");
+endif;
+
+if
+	prop("gapps.prop", "Street")=="1"
+then
+	appendvar("gapps", "Street\n");
+endif;
+
+if
+	prop("gapps.prop", "Photos")=="1"
+then
+	appendvar("gapps", "Photos\n");
+endif;
+
+if
+	prop("gapps.prop", "Talkback")=="1"
+then
+	appendvar("gapps", "Talkback\n");
+endif;
+
+if
+	prop("gapps.prop", "Wallet")=="1"
+then
+	appendvar("gapps", "Wallet\n");
+endif;
+
+
+if
+	prop("gapps.prop", "Webview")=="1"
+then
+	appendvar("gapps", "Webview\n");
+endif;
+
+if
+	prop("gapps.prop", "YouTube")=="1"
+then
+	appendvar("gapps", "YouTube\n");
+endif;
+
+
+
+appendvar("gapps", "\n");
+
+
+
+# REMOVALS
+if
+	prop("rem.prop", "BasicDreams")=="1"
+then
+	appendvar("gapps", "BasicDreams\n");
+endif;
+
+if
+	prop("rem.prop", "Browser")=="1"
+then
+	appendvar("gapps", "Browser\n");
+endif;
+
+if
+	prop("rem.prop", "CalendarStock")=="1"
+then
+	appendvar("gapps", "CalendarStock\n");
+endif;
+
+if
+	prop("rem.prop", "CameraStock")=="1"
+then
+	appendvar("gapps", "CameraStock\n");
+endif;
+
+if
+	prop("rem.prop", "CMAccount")=="1"
+then
+	appendvar("gapps", "CMAccount\n");
+endif;
+
+if
+	prop("rem.prop", "CMAudioFX")=="1"
+then
+	appendvar("gapps", "CMAudioFX\n");
+endif;
+
+if
+	prop("rem.prop", "CMEleven")=="1"
+then
+	appendvar("gapps", "CMEleven\n");
+endif;
+
+if
+	prop("rem.prop", "CMFileManager")=="1"
+then
+	appendvar("gapps", "CMFileManager\n");
+endif;
+
+if
+	prop("rem.prop", "CMSetupWizard")=="1"
+then
+	appendvar("gapps", "CMSetupWizard\n");
+endif;
+
+if
+	prop("rem.prop", "CMUpdater")=="1"
+then
+	appendvar("gapps", "CMUpdater\n");
+endif;
+
+if
+	prop("rem.prop", "CMWallpapers")=="1"
+then
+	appendvar("gapps", "CMWallpapers\n");
+endif;
+
+if
+	prop("rem.prop", "DashClock")=="1"
+then
+	appendvar("gapps", "DashClock\n");
+endif;
+
+if
+	prop("rem.prop", "Email")=="1"
+then
+	appendvar("gapps", "Email\n");
+endif;
+
+if
+	prop("rem.prop", "ExchangeStock")=="1"
+then
+	appendvar("gapps", "ExchangeStock\n");
+endif;
+
+if
+	prop("rem.prop", "FMRadio")=="1"
+then
+	appendvar("gapps", "FMRadio\n");
+endif;
+
+if
+	prop("rem.prop", "Galaxy")=="1"
+then
+	appendvar("gapps", "Galaxy\n");
+endif;
+
+if
+	prop("rem.prop", "Gallery")=="1"
+then
+	appendvar("gapps", "Gallery\n");
+endif;
+
+if
+	prop("rem.prop", "HoloSpiral")=="1"
+then
+	appendvar("gapps", "HoloSpiral\n");
+endif;
+
+if
+	prop("rem.prop", "KeyboardStock")=="1"
+then
+	appendvar("gapps", "KeyboardStock\n");
+endif;
+
+if
+	prop("rem.prop", "Launcher")=="1"
+then
+	appendvar("gapps", "Launcher \n");
+endif;
+
+if
+	prop("rem.prop", "LiveWallpapers")=="1"
+then
+	appendvar("gapps", "LiveWallpapers\n");
+endif;
+
+if
+	prop("rem.prop", "LockClock")=="1"
+then
+	appendvar("gapps", "LockClock\n");
+endif;
+
+if
+	prop("rem.prop", "MMS")=="1"
+then
+	appendvar("gapps", "MMS\n");
+endif;
+
+if
+	prop("rem.prop", "NoiseField")=="1"
+then
+	appendvar("gapps", "NoiseField\n");
+endif;
+
+if
+	prop("rem.prop", "Phasebeam")=="1"
+then
+	appendvar("gapps", "Phasebeam\n");
+endif;
+
+if
+	prop("rem.prop", "PhotoPhase")=="1"
+then
+	appendvar("gapps", "PhotoPhase\n");
+endif;
+
+if
+	prop("rem.prop", "PhotoTable")=="1"
+then
+	appendvar("gapps", "PhotoTable\n");
+endif;
+
+if
+	prop("rem.prop", "PicoTTS")=="1"
+then
+	appendvar("gapps", "PicoTTS\n");
+endif;
+
+if
+	prop("rem.prop", "SimToolKit")=="1"
+then
+	appendvar("gapps", "SimToolKit\n");
+endif;
+
+if
+	prop("rem.prop", "Studio")=="1"
+then
+	appendvar("gapps", "Studio\n");
+endif;
+
+if
+	prop("rem.prop", "SykoPath")=="1"
+then
+	appendvar("gapps", "SykoPath\n");
+endif;
+
+if
+	prop("rem.prop", "Terminal")=="1"
+then
+	appendvar("gapps", "Terminal\n");
+endif;
+
+if
+	prop("rem.prop", "Themes")=="1"
+then
+	appendvar("gapps", "Themes\n");
+endif;
+
+if
+	prop("rem.prop", "VisualizationWallpapers")=="1"
+then
+	appendvar("gapps", "VisualizationWallpapers\n");
+endif;
+
+if
+	prop("rem.prop", "WhisperPush")=="1"
+then
+	appendvar("gapps", "WhisperPush\n");
+endif;
+
+
+
+#BYPASS THE DEFAULT REMOVAL
+appendvar("gapps", "\n\n");
+if
+	prop("bypass.prop", "+Browser")=="1"
+then
+	appendvar("gapps", "+Browser\n");
+endif;
+if
+	prop("bypass.prop", "+Email")=="1"
+then
+	appendvar("gapps", "+Email\n");
+endif;
+if
+	prop("bypass.prop", "+Gallery")=="1"
+then
+	appendvar("gapps", "+Gallery\n");
+endif;
+if
+	prop("bypass.prop", "+Launcher")=="1"
+then
+	appendvar("gapps", "+Launcher\n");
+endif;
+if
+	prop("bypass.prop", "+MMS")=="1"
+then
+	appendvar("gapps", "+MMS\n");
+endif;
+if
+	prop("bypass.prop", "+PicoTTS")=="1"
+then
+	appendvar("gapps", "+PicoTTS\n");
+endif;
+
+
+#WRITE GAPPS-CONFIG TO TEMP/AROMA AND DISPLAY IT
+writetmpfile(".gapps-config", getvar("gapps"));
+
+textbox(
+    "gapps-config",
+    "Your gapps-config file.",
+    "@update",
+		read("tmp/aroma/.gapps-config")
+	);
+
+##############################################
+#
+#Save selections
+#
+##############################################
+checkviewbox(
+	"Save selections",
+	"Save selections on sdcard or emualted storage: /sdcard/Open-GApps\n\n\n\n\n<b>Do you want to save the selections on sdcard? They will save time in future installations.</b>\n\n",
+	"@welcome",
+
+	"Save selections.", "1", "saveselections"
+);
+if
+		getvar("saveselections")=="1" 
+	then
+		resexec("scripts/tools.sh", "save");
+endif;
+
+#PreInstall
+ini_set("text_next", "Install GApps");
+viewbox(
+	"Save gapps-config and perform GApps installation.",
+	"Ready install GApps based on your preferences.\n\n\n\n\n" +
+	"Press <b>Install GApps</b> to perform the GApps installation.\n\n" +
+	"If you want to review or change any of your settings, press <b>Back</b>.",
+	"@install"
+);
+
+#Install
+ini_set("text_next", "Next");
+install(
+	"Installing",
+	"<b>GApps</b> are being installed.\n\n" +
+	"Please wait until the process is finished",
+	"@install",
+	"Press Next to continue."
+);
+
+#PostInstall
+ini_set("text_next", "Finish");
+checkviewbox(
+	"All done!",
+	"<b>Congratulation...</b>\n\n\n\n\n" +
+	"Open GApps has been installed into your device.",
+	"@welcome",
+
+	"Reboot your device now.", "0", "reboot_it"
+);
+
+#Reboot
+if
+	getvar("reboot_it")=="1"
+then
+	reboot("onfinish");
+endif;
+EOFILE
@@ -711,7 +711,7 @@ busybox mount -o rw,remount /system;
 # _____________________________________________________________________________________________________________________
 #                                                  Gather Device & GApps Package Information
 # Locate gapps-config (if used)
-for i in "$zip_folder/.gapps-config" "$zip_folder/gapps-config.txt" /sdcard/Open-GApps/.gapps-config /sdcard/Open-GApps/gapps-config.txt "$zip_folder/.gapps-config.txt" /sdcard/Open-GApps/.gapps-config.txt; do
+for i in "/tmp/aroma/.gapps-config" "$zip_folder/.gapps-config" "$zip_folder/gapps-config.txt" /sdcard/Open-GApps/.gapps-config /sdcard/Open-GApps/gapps-config.txt "$zip_folder/.gapps-config.txt" /sdcard/Open-GApps/.gapps-config.txt; do
    if [ -r "$i" ]; then
        g_conf="$i";
        break;
@@ -33,9 +33,28 @@ variantscripts() {
 	makeinstallerdata
 }

+aromascripts() {
+	aromaupdatebinary
+	install -d "$build"META-INF/com/google/android/aroma
+	copy "$SCRIPTS/aroma-resources/fonts" "$build"META-INF/com/google/android/aroma/fonts
+	copy "$SCRIPTS/aroma-resources/icons" "$build"META-INF/com/google/android/aroma/icons
+	copy "$SCRIPTS/aroma-resources/langs" "$build"META-INF/com/google/android/aroma/langs
+	copy "$SCRIPTS/aroma-resources/scripts" "$build"META-INF/com/google/android/aroma/scripts
+	copy "$SCRIPTS/aroma-resources/themes" "$build"META-INF/com/google/android/aroma/themes
+	copy "$SCRIPTS/aroma-resources/ttf" "$build"META-INF/com/google/android/aroma/ttf
+	copy "$SCRIPTS/aroma-resources/open.png" "$build"META-INF/com/google/android/aroma
+}
+
+aromaupdatebinary() {
+	mv "$build"META-INF/com/google/android/update-binary "$build"META-INF/com/google/android/update-binary-installer
+	copy "$SCRIPTS/aroma-resources/update-binary" "$build"META-INF/com/google/android/update-binary
+}
+
 createzip() {
+	if [ "x$1" = "x" ]; then VARIANTZIPNAME="$VARIANT"
+	else VARIANTZIPNAME="$1"; fi #allows for an override
 	unsignedzip="$BUILD/$ARCH/$API.zip"
-	signedzip="$OUT/open_gapps-$ARCH-$PLATFORM-$VARIANT-$DATE.zip"
+	signedzip="$OUT/open_gapps-$ARCH-$PLATFORM-$VARIANTZIPNAME-$DATE.zip"

 	case "$VARIANT" in
 		stock)	getzipfolders "$STOCK $FULL $MINI $MICRO $NANO $PICO";;