summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
author Alyssa Haroldsen <kupiakos@google.com> 2025-03-19 15:52:43 -0700
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2025-03-19 15:52:43 -0700
commitc7037fc8169de447f4365f4eaaea2f62f28988f6 (patch)
tree49467229710b23bab42f98d92e5ca0943d3439dd /android
parentd665efdac327dbfeebb738c20dcbcef2970efdef (diff)
parent80f92da0efc1924aa30866e64b266d1dee87aa51 (diff)
Merge "Rename desktop trusty .elf to .bin in neverallow allowlist" into main am: 80f92da0ef
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3549563 Change-Id: I64739981dfb5b41a6bf13b4dc8f7fbcbbc28a09f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'android')
-rw-r--r--android/neverallow.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/android/neverallow.go b/android/neverallow.go
index e693f2ddd..98b443ee4 100644
--- a/android/neverallow.go
+++ b/android/neverallow.go
@@ -311,9 +311,9 @@ func createLimitGenruleRules() []Rule {
"trusty_tee_package",
// Trusty vm target names
"trusty_desktop_vm_arm64.bin",
- "trusty_desktop_vm_x86_64.elf",
+ "trusty_desktop_vm_x86_64.bin",
"trusty_desktop_test_vm_arm64.bin",
- "trusty_desktop_test_vm_x86_64.elf",
+ "trusty_desktop_test_vm_x86_64.bin",
"trusty_test_vm_arm64.bin",
"trusty_test_vm_x86_64.elf",
"trusty_test_vm_os_arm64.bin",