diff options
| author | Kelvin Zhang <zhangkelvin@google.com> | 2021-11-19 20:15:33 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-11-19 20:15:33 +0000 |
| commit | 1de48bf84e890cc22f397ccece799fc67554a77f (patch) | |
| tree | e796a37895a74a9ecffab0478f63011c8711b73c /aosp | |
| parent | 7be427590935bc88198d32004449ccfcf60b60d4 (diff) | |
| parent | dd0b6e3bf2772b7aa743d157d3070bd6cd204a6e (diff) | |
| download | zucchini-1de48bf84e890cc22f397ccece799fc67554a77f.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-main' am: a2c45bea23 am: 0d1306182f am: dd0b6e3bf2
Original change: https://android-review.googlesource.com/c/platform/external/zucchini/+/1895428
Change-Id: Id00baf17a5e0ed9850acb726af82cca3c5dcd09f
Diffstat (limited to 'aosp')
| -rw-r--r-- | aosp/include/base/check_op.h | 2 | ||||
| l--------- | aosp/include/components/zucchini/version_info.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/aosp/include/base/check_op.h b/aosp/include/base/check_op.h index d72e4a4..47162e6 100644 --- a/aosp/include/base/check_op.h +++ b/aosp/include/base/check_op.h @@ -19,4 +19,6 @@ #include <base/logging.h> +#define FLAG_WIN_SHARE_DELETE FLAG_SHARE_DELETE + #endif /* __ZUCCHINI_AOSP_BASE_CHECK_OP_H */ diff --git a/aosp/include/components/zucchini/version_info.h b/aosp/include/components/zucchini/version_info.h new file mode 120000 index 0000000..be765ba --- /dev/null +++ b/aosp/include/components/zucchini/version_info.h @@ -0,0 +1 @@ +../../../../version_info.h
\ No newline at end of file |