Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2a8e522 authored by Elliott Hughes's avatar Elliott Hughes Committed by Automerger Merge Worker
Browse files

Merge changes I840cce02,I3dbe6b6d am: ef8ea8f9 am: 620030d0 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2251617



Change-Id: I23584b0c1157a767b7b35be7178813f4714f3664
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f477c821 620030d0

code_coverage/Android.bp

+16 −0
Original line number Original line Diff line number Diff line
@@ -24,6 +24,14 @@ prebuilt_etc { 
                },

                },

            },

            },

        },

        },

        riscv64: {

            src: "empty_policy/code_coverage.riscv64.policy",

            product_variables: {

                native_coverage: {

                    src: "seccomp_policy/code_coverage.riscv64.policy",

                },

            },

        },

        x86: {

        x86: {

            src: "empty_policy/code_coverage.x86.policy",

            src: "empty_policy/code_coverage.x86.policy",

            product_variables: {

            product_variables: {
@@ -67,6 +75,14 @@ prebuilt_etc { 
                },

                },

            },

            },

        },

        },

        riscv64: {

            src: "empty_policy/code_coverage.riscv64.policy",

            product_variables: {

                native_coverage: {

                    src: "seccomp_policy/code_coverage.riscv64.policy",

                },

            },

        },

        x86: {

        x86: {

            src: "empty_policy/code_coverage.x86_64.policy",

            src: "empty_policy/code_coverage.x86_64.policy",

            product_variables: {

            product_variables: {

code_coverage/empty_policy/code_coverage.riscv64.policy

0 → 100644
+2 −0
Original line number Original line Diff line number Diff line 
# empty unless code_coverage is enabled.

# code_coverage.riscv64.policy

code_coverage/seccomp_policy/code_coverage.riscv64.policy

0 → 100644
+15 −0
Original line number Original line Diff line number Diff line 
close: 1

fchmod: 1

mkdirat: 1

msync: 1

munmap: 1

openat: 1

write: 1

fcntl: 1

fstat: 1

ftruncate: 1

geteuid: 1

lseek: 1

mmap: 1

rt_sigreturn: 1

prctl: 1

libcutils/Android.bp

+5 −0
Original line number Original line Diff line number Diff line
@@ -219,6 +219,11 @@ cc_library { 
                misc_undefined: ["integer"],

                misc_undefined: ["integer"],

            },

            },

        },

        },

        android_riscv64: {

            sanitize: {

                misc_undefined: ["integer"],

            },

        },





        android_x86: {

        android_x86: {

            // TODO: This is to work around b/29412086.

            // TODO: This is to work around b/29412086.