From 83fc3048d6b892116862747e9eaeb21377568057 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Thu, 13 Oct 2022 13:46:29 -0700
Subject: [PATCH] Disable code_coverage.other for riscv64

code_coverage.policy.other is supposed to install a policy for the
"other" architecture, e.g. arm for arm64.  riscv64 doesn't have an
"other" architecture, disable the module.

Test: builds
Change-Id: Ic42c706dd9c1efe4b0fe9fa7c9823a2a379ba56b
---
 code_coverage/Android.bp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/code_coverage/Android.bp b/code_coverage/Android.bp
index f2c534193..d18e7a8f7 100644
--- a/code_coverage/Android.bp
+++ b/code_coverage/Android.bp
@@ -76,12 +76,8 @@ prebuilt_etc {
             },
         },
         riscv64: {
-            src: "empty_policy/code_coverage.riscv64.policy",
-            product_variables: {
-                native_coverage: {
-                    src: "seccomp_policy/code_coverage.riscv64.policy",
-                },
-            },
+            // riscv64 doesn't have a secondary architecture.
+            enabled: false,
         },
         x86: {
             src: "empty_policy/code_coverage.x86_64.policy",