Merge "Remove redefinition of uapi constant added in R." into main am: d5b09b4b97 am: c3bbf8237a am: 7a1d3efb41 am: 5c30491a99

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2760268

Change-Id: I15045a282c82e4da21ac9387d0d1ea0f4fd5c5f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-09-22 21:36:13 +00:00 committed by Automerger Merge Worker
commit 73f83e22f9

View file

@ -44,9 +44,6 @@
#include <android-base/strings.h>
#include <android-base/unique_fd.h>
/* Will be added to UAPI once upstream change is merged */
#define F_SEAL_FUTURE_WRITE 0x0010
/*
* The minimum vendor API level at and after which it is safe to use memfd.
* This is to facilitate deprecation of ashmem.