diff options
author | Tianjie Xu <xunchang@google.com> | 2017-05-31 23:57:18 +0200 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-05-31 23:57:18 +0200 |
commit | 66e53f59b95213abdabc262f28b3bf3d1ccbf0a8 (patch) | |
tree | e6adcf2ab67448c92d6cbd3de54e79ee6c75bc4e /updater | |
parent | Merge "Implement a custom deflate sink function for bspatch" am: 764eb215af (diff) | |
parent | Merge "kill package_extract_dir" (diff) | |
download | android_bootable_recovery-66e53f59b95213abdabc262f28b3bf3d1ccbf0a8.tar android_bootable_recovery-66e53f59b95213abdabc262f28b3bf3d1ccbf0a8.tar.gz android_bootable_recovery-66e53f59b95213abdabc262f28b3bf3d1ccbf0a8.tar.bz2 android_bootable_recovery-66e53f59b95213abdabc262f28b3bf3d1ccbf0a8.tar.lz android_bootable_recovery-66e53f59b95213abdabc262f28b3bf3d1ccbf0a8.tar.xz android_bootable_recovery-66e53f59b95213abdabc262f28b3bf3d1ccbf0a8.tar.zst android_bootable_recovery-66e53f59b95213abdabc262f28b3bf3d1ccbf0a8.zip |
Diffstat (limited to '')
-rw-r--r-- | updater/install.cpp | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/updater/install.cpp b/updater/install.cpp index c5f9a89bb..ff79edce0 100644 --- a/updater/install.cpp +++ b/updater/install.cpp @@ -61,7 +61,6 @@ #include "mounts.h" #include "ota_io.h" #include "otautil/DirUtil.h" -#include "otautil/ZipUtil.h" #include "print_sha1.h" #include "tune2fs.h" #include "updater/updater.h" @@ -389,36 +388,6 @@ Value* SetProgressFn(const char* name, State* state, const std::vector<std::uniq return StringValue(frac_str); } -// package_extract_dir(package_dir, dest_dir) -// Extracts all files from the package underneath package_dir and writes them to the -// corresponding tree beneath dest_dir. Any existing files are overwritten. -// Example: package_extract_dir("system", "/system") -// -// Note: package_dir needs to be a relative path; dest_dir needs to be an absolute path. -Value* PackageExtractDirFn(const char* name, State* state, - const std::vector<std::unique_ptr<Expr>>&argv) { - if (argv.size() != 2) { - return ErrorAbort(state, kArgsParsingFailure, "%s() expects 2 args, got %zu", name, - argv.size()); - } - - std::vector<std::string> args; - if (!ReadArgs(state, argv, &args)) { - return ErrorAbort(state, kArgsParsingFailure, "%s() Failed to parse the argument(s)", name); - } - const std::string& zip_path = args[0]; - const std::string& dest_path = args[1]; - - ZipArchiveHandle za = static_cast<UpdaterInfo*>(state->cookie)->package_zip; - - // To create a consistent system image, never use the clock for timestamps. - constexpr struct utimbuf timestamp = { 1217592000, 1217592000 }; // 8/1/2008 default - - bool success = ExtractPackageRecursive(za, zip_path, dest_path, ×tamp, sehandle); - - return StringValue(success ? "t" : ""); -} - // package_extract_file(package_file[, dest_file]) // Extracts a single package_file from the update package and writes it to dest_file, // overwriting existing files if necessary. Without the dest_file argument, returns the @@ -1037,7 +1006,6 @@ void RegisterInstallFunctions() { RegisterFunction("format", FormatFn); RegisterFunction("show_progress", ShowProgressFn); RegisterFunction("set_progress", SetProgressFn); - RegisterFunction("package_extract_dir", PackageExtractDirFn); RegisterFunction("package_extract_file", PackageExtractFileFn); RegisterFunction("getprop", GetPropFn); |