Merge "ime: update CPU_VARIANT to kryo" into android-8.1

Author: freak07

BoardConfig.mk

@@ -30,13 +30,13 @@ TARGET_ARCH := arm64
 TARGET_ARCH_VARIANT := armv8-a
 TARGET_CPU_ABI := arm64-v8a
 TARGET_CPU_ABI2 :=
-TARGET_CPU_VARIANT := generic
+TARGET_CPU_VARIANT := kryo
 
 TARGET_2ND_ARCH := arm
 TARGET_2ND_ARCH_VARIANT := armv7-a-neon
 TARGET_2ND_CPU_ABI := armeabi-v7a
 TARGET_2ND_CPU_ABI2 := armeabi
-TARGET_2ND_CPU_VARIANT := cortex-a9
+TARGET_2ND_CPU_VARIANT := kryo
 
 ENABLE_CPUSETS := true
 ENABLE_SCHEDBOOST := true
@@ -85,6 +85,7 @@ TW_BRIGHTNESS_PATH := "/sys/devices/platform/soc/a88000.i2c/i2c-0/0-002c/backlig
 TW_EXCLUDE_DEFAULT_USB_INIT := true
 TW_EXTRA_LANGUAGES := true
 TW_INCLUDE_NTFS_3G := true
+TW_INCLUDE_REPACKTOOLS := true
 TW_INPUT_BLACKLIST := "hbtp_vm"
 TW_HAS_DOWNLOAD_MODE := true
 TW_THEME := portrait_hdpi
@@ -95,7 +96,7 @@ TW_RECOVERY_ADDITIONAL_RELINK_FILES := $(OUT)/system/lib64/android.hardware.boot
 TARGET_RECOVERY_PIXEL_FORMAT := BGRA_8888
 TARGET_RECOVERY_QCOM_RTC_FIX := true
 TW_NO_SCREEN_BLANK := true
-TW_USE_TOOLBOX := true
+#TW_USE_TOOLBOX := true
 
 # Custom Platform Version and Security Patch
 # TWRP Defaults

recovery/root/sbin/mounts.sh

@@ -1,7 +1,7 @@
 #!/sbin/sh
 
 # Remove /system bind mount
-umount $ANDROID_ROOT
+umount "$ANDROID_ROOT"
 rm -f /system
 
 # Symlink tzdata

recovery/root/sbin/patchlevel.sh

@@ -26,6 +26,24 @@ log_error()
 	echo "E:$SCRIPTNAME:$1" >> "$LOGFILE"
 }
 
+temp_mount()
+{
+	mkdir "$1"
+	if [ -d "$1" ]; then
+		log_info "Temporary $2 folder created at $1."
+	else
+		log_error "Unable to create temporary $2 folder."
+		finish_error
+	fi
+	mount -t ext4 -o ro "$3" "$1"
+	if [ -n "$(ls -A "$1" 2>/dev/null)" ]; then
+		log_info "$2 mounted at $1."
+	else
+		log_error "Unable to mount $2 to temporary folder."
+		finish_error
+	fi
+}
+
 finish()
 {
 	umount "$TEMPVEN"
@@ -57,36 +75,8 @@ fingerprint=$(getprop ro.build.fingerprint)
 product=$(getprop ro.build.product)
 
 log_info "Running patchlevel pre-decrypt script for TWRP..."
-
-mkdir "$TEMPVEN"
-if [ -d "$TEMPVEN" ]; then
-	log_info "Temporary vendor folder created at $TEMPVEN."
-else
-	log_error "Unable to create temporary vendor folder."
-	finish_error
-fi
-mount -t ext4 -o ro "$venpath" "$TEMPVEN"
-if [ -n "$(ls -A "$TEMPVEN" 2>/dev/null)" ]; then
-	log_info "Vendor mounted at $TEMPVEN."
-else
-	log_error "Unable to mount vendor to temporary folder."
-	finish_error
-fi
-
-mkdir "$TEMPSYS"
-if [ -d "$TEMPSYS" ]; then
-	log_info "Temporary system folder created at $TEMPSYS."
-else
-	log_error "Unable to create temporary system folder."
-	finish_error
-fi
-mount -t ext4 -o ro "$syspath" "$TEMPSYS"
-if [ -n "$(ls -A "$TEMPSYS" 2>/dev/null)" ]; then
-	log_info "System mounted at $TEMPSYS."
-else
-	log_error "Unable to mount system to temporary folder."
-	finish_error
-fi
+temp_mount "$TEMPVEN" "vendor" "$venpath"
+temp_mount "$TEMPSYS" "system" "$syspath"
 
 if [ -f "$TEMPSYS/$BUILDPROP" ]; then
 	log_info "Build.prop exists! Setting system properties from build.prop"
@@ -95,14 +85,14 @@ if [ -f "$TEMPSYS/$BUILDPROP" ]; then
 	osver=$(grep -i 'ro.build.version.release' "$TEMPSYS/$BUILDPROP"  | cut -f2 -d'=' -s)
 	if [ -n "$osver" ]; then
 		resetprop ro.build.version.release "$osver"
-		sed -i "s/ro.build.version.release=.*/ro.build.version.release="$osver"/g" "/$DEFAULTPROP" ;
+		sed -i "s/ro.build.version.release=.*/ro.build.version.release=""$osver""/g" "/$DEFAULTPROP" ;
 		log_info "New OS Version: $osver"
 	fi
 	log_info "Current security patch level: $patchlevel"
 	patchlevel=$(grep -i 'ro.build.version.security_patch' "$TEMPSYS/$BUILDPROP"  | cut -f2 -d'=' -s)
 	if [ -n "$patchlevel" ]; then
 		resetprop ro.build.version.security_patch "$patchlevel"
-		sed -i "s/ro.build.version.security_patch=.*/ro.build.version.security_patch="$patchlevel"/g" "/$DEFAULTPROP" ;
+		sed -i "s/ro.build.version.security_patch=.*/ro.build.version.security_patch=""$patchlevel""/g" "/$DEFAULTPROP" ;
 		log_info "New security patch level: $patchlevel"
 	fi
 	# Set additional props from build.prop
@@ -111,21 +101,21 @@ if [ -f "$TEMPSYS/$BUILDPROP" ]; then
 	device=$(grep -i 'ro.product.device' "$TEMPSYS/$BUILDPROP"  | cut -f2 -d'=' -s)
 	if [ -n "$device" ]; then
 		resetprop ro.product.device "$device"
-		sed -i "s/ro.product.device=.*/ro.product.device="$device"/g" "/$DEFAULTPROP" ;
+		sed -i "s/ro.product.device=.*/ro.product.device=""$device""/g" "/$DEFAULTPROP" ;
 		log_info "New device: $device"
 	fi
 	log_info "Current fingerprint: $fingerprint"
 	fingerprint=$(grep -i 'ro.build.fingerprint' "$TEMPSYS/$BUILDPROP"  | cut -f2 -d'=' -s)
 	if [ -n "$fingerprint" ]; then
 		resetprop ro.build.fingerprint "$fingerprint"
-		sed -i "s/ro.build.fingerprint=.*/ro.build.fingerprint="$fingerprint"/g" "/$DEFAULTPROP" ;
+		sed -i "s/ro.build.fingerprint=.*/ro.build.fingerprint=""$fingerprint""/g" "/$DEFAULTPROP" ;
 		log_info "New fingerprint: $fingerprint"
 	fi
 	log_info "Current product: $product"
 	product=$(grep -i 'ro.build.product' "$TEMPSYS/$BUILDPROP"  | cut -f2 -d'=' -s)
 	if [ -n "$product" ]; then
 		resetprop ro.build.product "$product"
-		sed -i "s/ro.build.product=.*/ro.build.product="$product"/g" "/$DEFAULTPROP" ;
+		sed -i "s/ro.build.product=.*/ro.build.product=""$product""/g" "/$DEFAULTPROP" ;
 		log_info "New product: $product"
 	fi
 	# Load Tuxera exfat module
@@ -142,7 +132,7 @@ else
 		log_info "Setting OS Version to $osver_orig"
 		osver=$osver_orig
 		resetprop ro.build.version.release "$osver"
-		sed -i "s/ro.build.version.release=.*/ro.build.version.release="$osver"/g" "/$DEFAULTPROP" ;
+		sed -i "s/ro.build.version.release=.*/ro.build.version.release=""$osver""/g" "/$DEFAULTPROP" ;
 	else
 		log_info "No Original OS Version found. Proceeding with existing value."
 		log_info "Current OS version: $osver"
@@ -153,7 +143,7 @@ else
 		log_info "Setting security patch level to $patchlevel_orig"
 		patchlevel=$patchlevel_orig
 		resetprop ro.build.version.security_patch "$patchlevel"
-		sed -i "s/ro.build.version.security_patch=.*/ro.build.version.security_patch="$patchlevel"/g" "/$DEFAULTPROP" ;
+		sed -i "s/ro.build.version.security_patch=.*/ro.build.version.security_patch=""$patchlevel""/g" "/$DEFAULTPROP" ;
 	else
 		log_info "No Original security patch level found. Proceeding with existing value."
 		log_info "Current security patch level: $patchlevel"

recovery/root/sbin/runatboot.sh

@@ -57,7 +57,7 @@ log_info "CID Found: $bootcid"
 case $bootmid in
 	"2Q5510000")
 		## EMEA/Aisa TW/RUS/SEA India Dual-SIM ##
-		if [ $hardware == 'htc_exo' ]; then
+		if [ "$hardware" = 'htc_exo' ]; then
 			update_product_device "htc_exodugl";
 			update_model "EXODUS 1";
 		else
@@ -67,7 +67,7 @@ case $bootmid in
 		;;
 	"2Q5520000")
 		## EMEA/US Unlocked, Single-SIM ##
-		if [ $hardware == 'htc_exo' ]; then
+		if [ "$hardware" = 'htc_exo' ]; then
 			update_product_device "htc_exouhl";
 			update_model "EXODUS 1";
 		else
@@ -77,7 +77,7 @@ case $bootmid in
 		;;
 	"2Q5530000")
 		## CHINA, Dual-SIM ##
-		if [ $hardware == 'htc_exo' ]; then
+		if [ "$hardware" = 'htc_exo' ]; then
 			update_product_device "htc_exodtwl";
 			update_model "EXODUS 1";
 		else
@@ -87,7 +87,7 @@ case $bootmid in
 		;;
 	*)
 		log_error "MID device parameters unknown. Setting default values."
-		if [ $hardware == 'htc_exo' ]; then
+		if [ "$hardware" = 'htc_exo' ]; then
 			update_product_device "htc_exodugl";
 			update_model "EXODUS 1";
 		else