Merge remote-tracking branch 'aosp/upstream-main'

CL
* 261f4df0 Update callsites to use WIN_-prefixed base::File flags.
cause build failure on android, because AOSP's copy of libchrome doesn't
have WIN_ prefix. To address that I added

Change-Id: I5457ae8b784b86644f0ae86182bcb0422629bfd3

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.