739351d476
Change log:95336cb92b..191d55580eFull diff:95336cb92b..191d55580eRoll chromium third_party 4e16929f46..3a8f2a9e1e Change log:4e16929f46..3a8f2a9e1eChanged dependencies: * src/tools:c44a3f5eca..f524a53b81DEPS diff:95336cb92b..191d55580e/DEPS No update to Clang. TBR=titovartem@google.com, BUG=None CQ_INCLUDE_TRYBOTS=master.internal.tryserver.corp.webrtc:linux_internal Change-Id: Ic9c4a62b050383646e9fcf5cc07a5653c14ac06e Reviewed-on: https://webrtc-review.googlesource.com/76120 Reviewed-by: Patrik Höglund <phoglund@webrtc.org> Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> Reviewed-by: Artem Titov <titovartem@webrtc.org> Commit-Queue: Artem Titov <titovartem@webrtc.org> Cr-Commit-Position: refs/heads/master@{#23205}
29 lines
1013 B
Diff
29 lines
1013 B
Diff
diff --git a/third_party/ashmem/ashmem-dev.c b/third_party/ashmem/ashmem-dev.c
|
|
index 2303369d8167..52b3f47eeae0 100644
|
|
--- a/third_party/ashmem/ashmem-dev.c
|
|
+++ b/third_party/ashmem/ashmem-dev.c
|
|
@@ -72,6 +72,11 @@ int ashmem_set_prot_region(int fd, int prot)
|
|
return ioctl(fd, ASHMEM_SET_PROT_MASK, prot);
|
|
}
|
|
|
|
+int ashmem_get_prot_region(int fd)
|
|
+{
|
|
+ return ioctl(fd, ASHMEM_GET_PROT_MASK);
|
|
+}
|
|
+
|
|
int ashmem_pin_region(int fd, size_t offset, size_t len)
|
|
{
|
|
struct ashmem_pin pin = { offset, len };
|
|
diff --git a/third_party/ashmem/ashmem.h b/third_party/ashmem/ashmem.h
|
|
index 7d411cc064ba..d8afccbd2a6e 100644
|
|
--- a/third_party/ashmem/ashmem.h
|
|
+++ b/third_party/ashmem/ashmem.h
|
|
@@ -18,6 +18,7 @@ extern "C" {
|
|
|
|
int ashmem_create_region(const char *name, size_t size);
|
|
int ashmem_set_prot_region(int fd, int prot);
|
|
+int ashmem_get_prot_region(int fd);
|
|
int ashmem_pin_region(int fd, size_t offset, size_t len);
|
|
int ashmem_unpin_region(int fd, size_t offset, size_t len);
|
|
int ashmem_get_size_region(int fd);
|