diff options
| author | Kelvin Zhang <zhangkelvin@google.com> | 2021-11-19 19:59:02 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-11-19 19:59:02 +0000 |
| commit | dd0b6e3bf2772b7aa743d157d3070bd6cd204a6e (patch) | |
| tree | e796a37895a74a9ecffab0478f63011c8711b73c /patch_utils.h | |
| parent | 58b4d19a6b6c8a6790c31bb3d6fcd13a8892239b (diff) | |
| parent | 0d1306182f498b99796919b13f6ba7ff0961d64d (diff) | |
| download | zucchini-dd0b6e3bf2772b7aa743d157d3070bd6cd204a6e.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-main' am: a2c45bea23 am: 0d1306182f
Original change: https://android-review.googlesource.com/c/platform/external/zucchini/+/1895428
Change-Id: I210ab6c049b54c4bbe9863c5bed9db964ee8b4d1
Diffstat (limited to 'patch_utils.h')
| -rw-r--r-- | patch_utils.h | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/patch_utils.h b/patch_utils.h index 822fedc..82b2b48 100644 --- a/patch_utils.h +++ b/patch_utils.h @@ -11,20 +11,10 @@ #include <type_traits> #include "components/zucchini/image_utils.h" +#include "components/zucchini/version_info.h" namespace zucchini { -// A change in major version indicates breaking changes such that a patch -// definitely cannot be applied by a zucchini binary whose major version doesn't -// match. -enum : uint16_t { kMajorVersion = 1 }; -// A change in minor version indicates possibly breaking changes at the element -// level, such that it may not be possible to apply a patch whose minor version -// doesn't match this version. To determine if a given patch may be applied with -// this version, VerifyPatch() should be called. -enum : uint16_t { kMinorVersion = 0 }; -enum : uint16_t { kInvalidVersion = 0xffff }; - // A Zucchini 'ensemble' patch is the concatenation of a patch header with a // list of patch 'elements', each containing data for patching individual // elements. |