commit 73f83e22f918162efe7622cc35bb394558eed0cc
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Sep 22 21:36:13 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Sep 22 21:36:13 2023 +0000
tree 82c6a7c966408dfbac3d69c80180d41be079aca4
parent fcee2ca617d4428b4ed02726b98bba43776127b5
parent 5c30491a998f5ed81d73acf931825216338f4334

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>

libcutils/ashmem-dev.cpp

diff --git a/libcutils/ashmem-dev.cpp b/libcutils/ashmem-dev.cpp
index 6a27f9a..5e01da9 100644
--- a/libcutils/ashmem-dev.cpp
+++ b/libcutils/ashmem-dev.cpp
@@ -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.