diff options
| author | 2025-02-23 07:35:47 +0000 | |
|---|---|---|
| committer | 2025-02-25 07:27:47 +0000 | |
| commit | 89dab88cc55d9ab0ff85d0a30780ad182cdaf214 (patch) | |
| tree | 91edcbbe2b8c5f0c4b7f506ea03620efa07bb847 /android/neverallow.go | |
| parent | 08d40a1b365ca91981ce72ed44b33297c94d0e4a (diff) | |
neverallow: fix trusty genrule targets
- add ModuleType trusty_vm_genrule
- update target names
Bug: 371777025
Test: aosp build/trusty VM test
Change-Id: Ia493ba23dba69388bef92406f5aca656b20f2b1b
Diffstat (limited to 'android/neverallow.go')
| -rw-r--r-- | android/neverallow.go | 44 |
1 files changed, 20 insertions, 24 deletions
diff --git a/android/neverallow.go b/android/neverallow.go index 70af2acc3..14dc6d212 100644 --- a/android/neverallow.go +++ b/android/neverallow.go @@ -298,33 +298,29 @@ func createLimitDirgroupRule() []Rule { WithoutMatcher("visibility", InAllowedList([]string{"//trusty/vendor/google/aosp/scripts", "//trusty/vendor/google/proprietary/scripts"})).Because(reason), NeverAllow(). ModuleType("genrule"). - // TODO: remove the 4 below targets once new targets are submitted - Without("name", "trusty-arm64.lk.elf.gen"). - Without("name", "trusty-arm64-virt-test-debug.lk.elf.gen"). - Without("name", "trusty-x86_64.lk.elf.gen"). - Without("name", "trusty-x86_64-test.lk.elf.gen"). - // trusty vm target names moving forward - Without("name", "trusty-test_vm-arm64.elf.gen"). - Without("name", "trusty-test_vm-x86.elf.gen"). - Without("name", "trusty-security_vm-arm64.elf.gen"). - Without("name", "trusty-security_vm-x86.elf.gen"). - Without("name", "trusty-widevine_vm-arm64.elf.gen"). - Without("name", "trusty-widevine_vm-x86.elf.gen"). + // Trusty TEE target names + Without("name", "trusty_tee_package_goog"). + Without("name", "trusty_tee_package"). + // Trusty vm target names + Without("name", "trusty_test_vm_arm64.bin"). + Without("name", "trusty_test_vm_x86_64.elf"). + Without("name", "trusty_security_vm_arm64.bin"). + Without("name", "trusty_security_vm_x86_64.elf"). + Without("name", "trusty_widevine_vm_arm64.bin"). + Without("name", "trusty_widevine_vm_x86_64.elf"). WithMatcher("dir_srcs", isSetMatcherInstance).Because(reason), NeverAllow(). ModuleType("genrule"). - // TODO: remove the 4 below targets once new targets are submitted - Without("name", "trusty-arm64.lk.elf.gen"). - Without("name", "trusty-arm64-virt-test-debug.lk.elf.gen"). - Without("name", "trusty-x86_64.lk.elf.gen"). - Without("name", "trusty-x86_64-test.lk.elf.gen"). - // trusty vm target names moving forward - Without("name", "trusty-test_vm-arm64.elf.gen"). - Without("name", "trusty-test_vm-x86.elf.gen"). - Without("name", "trusty-security_vm-arm64.elf.gen"). - Without("name", "trusty-security_vm-x86.elf.gen"). - Without("name", "trusty-widevine_vm-arm64.elf.gen"). - Without("name", "trusty-widevine_vm-x86.elf.gen"). + // Trusty TEE target names + Without("name", "trusty_tee_package_goog"). + Without("name", "trusty_tee_package"). + // Trusty vm target names + Without("name", "trusty_test_vm_arm64.bin"). + Without("name", "trusty_test_vm_x86_64.elf"). + Without("name", "trusty_security_vm_arm64.bin"). + Without("name", "trusty_security_vm_x86_64.elf"). + Without("name", "trusty_widevine_vm_arm64.bin"). + Without("name", "trusty_widevine_vm_x86_64.elf"). With("keep_gendir", "true").Because(reason), } } |