Support new AB OTA zips
Change-Id: I1ff883375a0a769bf27a834c9bf04c6cdbb42117
diff --git a/twinstall.cpp b/twinstall.cpp
index 50d286c..75d9a48 100644
--- a/twinstall.cpp
+++ b/twinstall.cpp
@@ -45,15 +45,26 @@
#include "gui/gui.hpp"
#include "gui/pages.hpp"
#include "legacy_property_service.h"
+#include "twinstall.h"
+#include "installcommand.h"
extern "C" {
#include "gui/gui.h"
}
+#define AB_OTA "payload_properties.txt"
+
static const char* properties_path = "/dev/__properties__";
static const char* properties_path_renamed = "/dev/__properties_kk__";
static bool legacy_props_env_initd = false;
static bool legacy_props_path_modified = false;
+enum zip_type {
+ UNKNOWN_ZIP_TYPE = 0,
+ UPDATE_BINARY_ZIP_TYPE,
+ AB_OTA_ZIP_TYPE,
+ TWRP_THEME_ZIP_TYPE
+};
+
// to support pre-KitKat update-binaries that expect properties in the legacy format
static int switch_to_legacy_properties()
{
@@ -126,26 +137,22 @@
#endif
}
-static int Run_Update_Binary(const char *path, ZipArchive *Zip, int* wipe_cache) {
+static int Prepare_Update_Binary(const char *path, ZipArchive *Zip, int* wipe_cache) {
const ZipEntry* binary_location = mzFindZipEntry(Zip, ASSUMED_UPDATE_BINARY_NAME);
- string Temp_Binary = "/tmp/updater"; // Note: AOSP names it /tmp/update_binary (yes, with "_")
- int binary_fd, ret_val, pipe_fd[2], status, zip_verify;
- char buffer[1024];
- const char** args = (const char**)malloc(sizeof(char*) * 5);
- FILE* child_data;
+ int binary_fd, ret_val;
if (binary_location == NULL) {
return INSTALL_CORRUPT;
}
// Delete any existing updater
- if (TWFunc::Path_Exists(Temp_Binary) && unlink(Temp_Binary.c_str()) != 0) {
- LOGINFO("Unable to unlink '%s': %s\n", Temp_Binary.c_str(), strerror(errno));
+ if (TWFunc::Path_Exists(TMP_UPDATER_BINARY_PATH) && unlink(TMP_UPDATER_BINARY_PATH) != 0) {
+ LOGINFO("Unable to unlink '%s': %s\n", TMP_UPDATER_BINARY_PATH, strerror(errno));
}
- binary_fd = creat(Temp_Binary.c_str(), 0755);
+ binary_fd = creat(TMP_UPDATER_BINARY_PATH, 0755);
if (binary_fd < 0) {
- LOGERR("Could not create file for updater extract in '%s': %s\n", Temp_Binary.c_str(), strerror(errno));
+ LOGERR("Could not create file for updater extract in '%s': %s\n", TMP_UPDATER_BINARY_PATH, strerror(errno));
mzCloseZipArchive(Zip);
return INSTALL_ERROR;
}
@@ -189,6 +196,13 @@
}
}
mzCloseZipArchive(Zip);
+ return INSTALL_SUCCESS;
+}
+
+static int Run_Update_Binary(const char *path, ZipArchive *Zip, int* wipe_cache, zip_type ztype) {
+ int ret_val, pipe_fd[2], status, zip_verify;
+ char buffer[1024];
+ FILE* child_data;
#ifndef TW_NO_LEGACY_PROPS
/* Set legacy properties */
@@ -201,25 +215,35 @@
pipe(pipe_fd);
- args[0] = Temp_Binary.c_str();
- args[1] = EXPAND(RECOVERY_API_VERSION);
- char* temp = (char*)malloc(10);
- sprintf(temp, "%d", pipe_fd[1]);
- args[2] = temp;
- args[3] = (char*)path;
- args[4] = NULL;
+ std::vector<std::string> args;
+ if (ztype == UPDATE_BINARY_ZIP_TYPE) {
+ ret_val = update_binary_command(path, Zip, 0, pipe_fd[1], &args);
+ } else if (ztype == AB_OTA_ZIP_TYPE) {
+ ret_val = abupdate_binary_command(path, Zip, 0, pipe_fd[1], &args);
+ } else {
+ LOGERR("Unknown zip type %i\n", ztype);
+ ret_val = INSTALL_CORRUPT;
+ }
+ if (ret_val) {
+ close(pipe_fd[0]);
+ close(pipe_fd[1]);
+ return ret_val;
+ }
+
+ // Convert the vector to a NULL-terminated char* array suitable for execv.
+ const char* chr_args[args.size() + 1];
+ chr_args[args.size()] = NULL;
+ for (size_t i = 0; i < args.size(); i++)
+ chr_args[i] = args[i].c_str();
pid_t pid = fork();
if (pid == 0) {
close(pipe_fd[0]);
- execve(Temp_Binary.c_str(), (char* const*)args, environ);
- printf("E:Can't execute '%s': %s\n", Temp_Binary.c_str(), strerror(errno));
- free(temp);
+ execve(chr_args[0], const_cast<char**>(chr_args), environ);
+ printf("E:Can't execute '%s': %s\n", chr_args[0], strerror(errno));
_exit(-1);
}
close(pipe_fd[1]);
- free(temp);
- temp = NULL;
*wipe_cache = 0;
@@ -341,16 +365,35 @@
sysReleaseMap(&map);
return INSTALL_CORRUPT;
}
+
time_t start, stop;
time(&start);
- ret_val = Run_Update_Binary(path, &Zip, wipe_cache);
+ const ZipEntry* file_location = mzFindZipEntry(&Zip, ASSUMED_UPDATE_BINARY_NAME);
+ if (file_location != NULL) {
+ LOGINFO("Update binary zip\n");
+ ret_val = Prepare_Update_Binary(path, &Zip, wipe_cache);
+ if (ret_val == INSTALL_SUCCESS)
+ ret_val = Run_Update_Binary(path, &Zip, wipe_cache, UPDATE_BINARY_ZIP_TYPE);
+ } else {
+ file_location = mzFindZipEntry(&Zip, AB_OTA);
+ if (file_location != NULL) {
+ LOGINFO("AB zip\n");
+ ret_val = Run_Update_Binary(path, &Zip, wipe_cache, AB_OTA_ZIP_TYPE);
+ } else {
+ file_location = mzFindZipEntry(&Zip, "ui.xml");
+ if (file_location != NULL) {
+ LOGINFO("TWRP theme zip\n");
+ ret_val = Install_Theme(path, &Zip);
+ } else {
+ mzCloseZipArchive(&Zip);
+ ret_val = INSTALL_CORRUPT;
+ }
+ }
+ }
time(&stop);
int total_time = (int) difftime(stop, start);
if (ret_val == INSTALL_CORRUPT) {
- // If no updater binary is found, check for ui.xml
- ret_val = Install_Theme(path, &Zip);
- if (ret_val == INSTALL_CORRUPT)
- gui_msg(Msg(msg::kError, "no_updater_binary=Could not find '{1}' in the zip file.")(ASSUMED_UPDATE_BINARY_NAME));
+ gui_err("invalid_zip_format=Invalid zip file format!");
} else {
LOGINFO("Install took %i second(s).\n", total_time);
}