0e844b0289
Author: Tom Marshall <tdm.code@gmail.com>
Date: Wed Oct 25 20:27:08 2017 +0200
Revert "kill package_extract_dir"
changes for P:
- bring back the mkdir_recursively variant which takes a timestamp.
- add libziparchive dependency
- fix otautil header paths
changes for Q:
- change ziputil naming convention to lowercase
This reverts commit 53c38b1538.
Change-Id: I71c488e96a1f23aace3c38fc283aae0165129a12
Author: Tom Marshall <tdm.code@gmail.com>
Date: Thu Dec 14 22:37:17 2017 +0100
Revert "Remove the obsolete package_extract_dir() test"
This reverts commit bb7e005a79.
Change-Id: I643235d6605d7da2a189eca10ec999b25c23e1f9
Author: Tom Marshall <tdm.code@gmail.com>
Date: Wed Aug 23 18:14:00 2017 +0000
Revert "updater: Remove some obsoleted functions for file-based OTA."
This reverts commit 63d786cf22.
These functions will be used for third party OTA zips, so keep them.
Change-Id: I24b67ba4c86f8f86d0a41429a395fece1a383efd
Author: Stricted <info@stricted.net>
Date: Mon Mar 12 18:11:56 2018 +0100
recovery: updater: Fix SymlinkFn args
Change-Id: If2ba1b7a8b5ac471a2db84f352273fd0ea7c81a2
Author: Simon Shields <simon@lineageos.org>
Date: Thu Aug 9 01:17:21 2018 +1000
Revert "updater: Remove dead make_parents()."
This reverts commit 5902691764.
Change-Id: I69eadf1a091f6ecd45531789dedf72a178a055ba
Author: Simon Shields <simon@lineageos.org>
Date: Thu Aug 9 01:20:40 2018 +1000
Revert "otautil: Delete dirUnlinkHierarchy()."
changes for P:
- Fix missing PATH_MAX macro from limits.h
This reverts commit 7934985e0c.
Change-Id: I67ce71a1644b58a393dce45a6c3dee97830b9ee4
Author: XiNGRZ <chenxingyu92@gmail.com>
Date: Tue Dec 3 14:31:56 2019 +0800
updater: Fix lost capabilities of set_metadata
This was broken since Android O. During a file-based incremental OTA,
capability flags were cleared but not being set again properly, leading
some critical processes (e.g. surfaceflinger and pm-service) fails.
For more details, see: 65b8d749f7
Change-Id: I20e616cd83ec1cd1b79717a6703919316ad77938
[mikeioannina]: Squash for Q and run through clang-format
[Chippa_a]: Adapt for Android R updater and libziparchive API
Change-Id: I91973bc9e9f8d100688c0112fda9043fd45eb86a
87 lines
2.9 KiB
C++
87 lines
2.9 KiB
C++
/*
|
|
* Copyright (C) 2016 The Android Open Source Project
|
|
*
|
|
* 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.
|
|
*/
|
|
|
|
#include <errno.h>
|
|
#include <unistd.h>
|
|
|
|
#include <memory>
|
|
#include <vector>
|
|
|
|
#include <android-base/file.h>
|
|
#include <gtest/gtest.h>
|
|
#include <otautil/ziputil.h>
|
|
#include <ziparchive/zip_archive.h>
|
|
|
|
#include "common/test_constants.h"
|
|
#include "otautil/sysutil.h"
|
|
|
|
TEST(ZipTest, ExtractPackageRecursive) {
|
|
std::string zip_path = from_testdata_base("ziptest_valid.zip");
|
|
ZipArchiveHandle handle;
|
|
ASSERT_EQ(0, OpenArchive(zip_path.c_str(), &handle));
|
|
|
|
// Extract the whole package into a temp directory.
|
|
TemporaryDir td;
|
|
ASSERT_NE(nullptr, td.path);
|
|
ExtractPackageRecursive(handle, "", td.path, nullptr, nullptr);
|
|
|
|
// Make sure all the files are extracted correctly.
|
|
std::string path(td.path);
|
|
ASSERT_EQ(0, access((path + "/a.txt").c_str(), F_OK));
|
|
ASSERT_EQ(0, access((path + "/b.txt").c_str(), F_OK));
|
|
ASSERT_EQ(0, access((path + "/b/c.txt").c_str(), F_OK));
|
|
ASSERT_EQ(0, access((path + "/b/d.txt").c_str(), F_OK));
|
|
|
|
// The content of the file is the same as expected.
|
|
std::string content1;
|
|
ASSERT_TRUE(android::base::ReadFileToString(path + "/a.txt", &content1));
|
|
ASSERT_EQ(kATxtContents, content1);
|
|
|
|
std::string content2;
|
|
ASSERT_TRUE(android::base::ReadFileToString(path + "/b/d.txt", &content2));
|
|
ASSERT_EQ(kDTxtContents, content2);
|
|
|
|
CloseArchive(handle);
|
|
|
|
// Clean up.
|
|
ASSERT_EQ(0, unlink((path + "/a.txt").c_str()));
|
|
ASSERT_EQ(0, unlink((path + "/b.txt").c_str()));
|
|
ASSERT_EQ(0, unlink((path + "/b/c.txt").c_str()));
|
|
ASSERT_EQ(0, unlink((path + "/b/d.txt").c_str()));
|
|
ASSERT_EQ(0, rmdir((path + "/b").c_str()));
|
|
}
|
|
|
|
TEST(ZipTest, OpenFromMemory) {
|
|
std::string zip_path = from_testdata_base("ziptest_fake-update.zip");
|
|
MemMapping map;
|
|
ASSERT_TRUE(map.MapFile(zip_path));
|
|
|
|
// Map an update package into memory and open the archive from there.
|
|
ZipArchiveHandle handle;
|
|
ASSERT_EQ(0, OpenArchiveFromMemory(map.addr, map.length, zip_path.c_str(), &handle));
|
|
|
|
static constexpr const char* BINARY_PATH = "META-INF/com/google/android/update-binary";
|
|
ZipEntry64 binary_entry;
|
|
// Make sure the package opens correctly and its entry can be read.
|
|
ASSERT_EQ(0, FindEntry(handle, BINARY_PATH, &binary_entry));
|
|
|
|
TemporaryFile tmp_binary;
|
|
ASSERT_NE(-1, tmp_binary.fd);
|
|
ASSERT_EQ(0, ExtractEntryToFile(handle, &binary_entry, tmp_binary.fd));
|
|
|
|
CloseArchive(handle);
|
|
}
|
|
|