Minor changes

zip-content/inc/common-functions.sh

@@ -688,12 +688,24 @@ initialize()
   _detect_main_architectures
   _generate_architectures_list
 
+  if test "${CPU64:?}" = 'false' && test "${CPU:?}" = 'false'; then
+    ui_error "Unsupported CPU, ABI list: ${_raw_arch_list:-}"
+  fi
+
   if test "${API:?}" -lt 1; then
     ui_error 'Invalid API level'
   fi
 
-  if test "${CPU64:?}" = 'false' && test "${CPU:?}" = 'false'; then
-    ui_error "Unsupported CPU, ABI list: ${_raw_arch_list:-}"
+  if test "${API:?}" -ge 19; then # KitKat or higher
+    PRIVAPP_FOLDER='priv-app'
+  else
+    PRIVAPP_FOLDER='app'
+  fi
+  PRIVAPP_PATH="${SYS_PATH:?}/${PRIVAPP_FOLDER:?}"
+  readonly PRIVAPP_FOLDER PRIVAPP_PATH
+
+  if test ! -e "${PRIVAPP_PATH:?}"; then
+    ui_error 'The priv-app folder does NOT exist'
   fi
 
   unset LAST_MOUNTPOINT

zip-content/scripts/install.sh

@@ -24,15 +24,6 @@ INSTALL_ANDROIDAUTO="$(parse_setting 'INSTALL_ANDROIDAUTO' "${INSTALL_ANDROIDAUT
 
 INSTALLATION_SETTINGS_FILE="${MODULE_ID:?}.prop"
 
-if test "${API:?}" -ge 19; then # KitKat or higher
-  PRIVAPP_FOLDER='priv-app'
-else
-  PRIVAPP_FOLDER='app'
-fi
-PRIVAPP_PATH="${SYS_PATH:?}/${PRIVAPP_FOLDER:?}"
-readonly PRIVAPP_FOLDER PRIVAPP_PATH
-if test ! -e "${PRIVAPP_PATH:?}"; then ui_error 'The priv-app folder does NOT exist'; fi
-
 if test "${API:?}" -ge 8; then
   : ### Supported Android versions
 else