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