| commit | 7a1d3efb419b399a1c4ea811e5b7789a1dcdd456 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Fri Sep 22 20:01:41 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 22 20:01:41 2023 +0000 |
| tree | 82c6a7c966408dfbac3d69c80180d41be079aca4 | |
| parent | afc3f8e7e404134c5c3ba77d6cfd7f869459d8b0 [diff] | |
| parent | c3bbf8237a2a7ac81926f99ef1dd91a0a08fd66d [diff] |
Merge "Remove redefinition of uapi constant added in R." into main am: d5b09b4b97 am: c3bbf8237a Original change: https://android-review.googlesource.com/c/platform/system/core/+/2760268 Change-Id: Icc73bfcb93772b2cdb3c247ff02987f123f99aca Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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.