commit b534f2fbc0308caf3e33f5054890a44a84664eca
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Oct 29 18:09:24 2021 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Oct 29 18:09:24 2021 +0000
tree fb530e0d302071bab9b3cbfdfe2e7ce424596520
parent 3614aaf4d4874b1e0faaf7648327d2448b015add
parent 1a0453876f3cd780713f6b054ba97eeaa326b97a

Merge cherrypicks of [16093381] into sc-qpr1-release.

Change-Id: I2045dd5cfdc76b61e1989fa0e2d238c5e6affc91

runtime/jit/jit_memory_region.cc

diff --git a/runtime/jit/jit_memory_region.cc b/runtime/jit/jit_memory_region.cc
index b0699c4..56407f5 100644
--- a/runtime/jit/jit_memory_region.cc
+++ b/runtime/jit/jit_memory_region.cc
@@ -556,7 +556,7 @@
       return false;
     }
   } else {
-    palette_status_t status = PaletteAshmemSetProtRegion(fd, PROT_READ);
+    palette_status_t status = PaletteAshmemSetProtRegion(fd, PROT_READ | PROT_EXEC);
     if (status != PALETTE_STATUS_OK) {
       CHECK_EQ(status, PALETTE_STATUS_CHECK_ERRNO);
       std::ostringstream oss;