diff options
| author | Tao Bao <tbao@google.com> | 2017-04-20 00:10:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-04-20 00:10:09 +0000 |
| commit | b0945e1a23b26153aa386ca4e6f768f04b28abdf (patch) | |
| tree | 615d8c35c1982dbb64e2326aab117f208d18193a | |
| parent | e888d45950ea90d54efcb309269dbe226cf58ac7 (diff) | |
| parent | 919d2c9a5341d123fa1c97ffad3549c20e1dd021 (diff) | |
| download | android_bootable_recovery-b0945e1a23b26153aa386ca4e6f768f04b28abdf.tar.gz android_bootable_recovery-b0945e1a23b26153aa386ca4e6f768f04b28abdf.tar.bz2 android_bootable_recovery-b0945e1a23b26153aa386ca4e6f768f04b28abdf.zip | |
Merge "Call libvintf to verify package compatibility."
| -rw-r--r-- | Android.mk | 4 | ||||
| -rw-r--r-- | install.cpp | 15 | ||||
| -rw-r--r-- | tests/Android.mk | 3 |
3 files changed, 17 insertions, 5 deletions
@@ -55,6 +55,7 @@ endif LOCAL_MODULE := librecovery LOCAL_STATIC_LIBRARIES := \ libminui \ + libvintf_recovery \ libcrypto_utils \ libcrypto \ libbase @@ -114,6 +115,9 @@ LOCAL_STATIC_LIBRARIES := \ libfs_mgr \ libcrypto_utils \ libcrypto \ + libvintf_recovery \ + libvintf \ + libtinyxml2 \ libbase \ libcutils \ libutils \ diff --git a/install.cpp b/install.cpp index 73ddf5e9..e5a59b83 100644 --- a/install.cpp +++ b/install.cpp @@ -44,6 +44,7 @@ #include <android-base/properties.h> #include <android-base/stringprintf.h> #include <android-base/strings.h> +#include <vintf/VintfObjectRecovery.h> #include <ziparchive/zip_archive.h> #include "common.h" @@ -535,10 +536,15 @@ bool verify_package_compatibility(ZipArchiveHandle package_zip) { } CloseArchive(zip_handle); - // TODO(b/36814503): Enable the actual verification when VintfObject::CheckCompatibility() lands. - // VintfObject::CheckCompatibility returns zero on success. - // return (android::vintf::VintfObject::CheckCompatibility(compatibility_info, true) == 0); - return true; + // VintfObjectRecovery::CheckCompatibility returns zero on success. + std::string err; + int result = android::vintf::VintfObjectRecovery::CheckCompatibility(compatibility_info, &err); + if (result == 0) { + return true; + } + + LOG(ERROR) << "Failed to verify package compatibility (result " << result << "): " << err; + return false; } static int @@ -590,7 +596,6 @@ really_install_package(const char *path, bool* wipe_cache, bool needs_mount, // Additionally verify the compatibility of the package. if (!verify_package_compatibility(zip)) { - LOG(ERROR) << "Failed to verify package compatibility"; log_buffer.push_back(android::base::StringPrintf("error: %d", kPackageCompatibilityFailure)); sysReleaseMap(&map); CloseArchive(zip); diff --git a/tests/Android.mk b/tests/Android.mk index 20cbcc14..e5266303 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -132,6 +132,9 @@ LOCAL_STATIC_LIBRARIES := \ libdivsufsort64 \ libfs_mgr \ liblog \ + libvintf_recovery \ + libvintf \ + libtinyxml2 \ libselinux \ libext4_utils \ libsparse \ |