Merge "build code_coverage.policy with Android.bp" am: 59de77e777 am: b8709d62fd am: 4efc0c8996

Change-Id: Ie64a2edcf365ce544fee73530c7751bdd614e888
This commit is contained in:
Automerger Merge Worker 2020-02-13 18:01:10 +00:00
commit 7eb2bf5fe6
2 changed files with 83 additions and 37 deletions

83
code_coverage/Android.bp Normal file
View file

@ -0,0 +1,83 @@
prebuilt_etc {
name: "code_coverage.policy",
sub_dir: "seccomp_policy",
filename_from_src: true,
arch: {
arm: {
src: "empty_policy/code_coverage.arm.policy",
product_variables: {
native_coverage: {
src: "seccomp_policy/code_coverage.arm.policy",
},
},
},
arm64: {
src: "empty_policy/code_coverage.arm64.policy",
product_variables: {
native_coverage: {
src: "seccomp_policy/code_coverage.arm64.policy",
},
},
},
x86: {
src: "empty_policy/code_coverage.x86.policy",
product_variables: {
native_coverage: {
src: "seccomp_policy/code_coverage.x86.policy",
},
},
},
x86_64: {
src: "empty_policy/code_coverage.x86_64.policy",
product_variables: {
native_coverage: {
src: "seccomp_policy/code_coverage.x86_64.policy",
},
},
},
},
required: [
"code_coverage.policy.other",
],
}
prebuilt_etc {
name: "code_coverage.policy.other",
sub_dir: "seccomp_policy",
filename_from_src: true,
arch: {
arm: {
src: "empty_policy/code_coverage.arm64.policy",
product_variables: {
native_coverage: {
src: "seccomp_policy/code_coverage.arm64.policy",
},
},
},
arm64: {
src: "empty_policy/code_coverage.arm.policy",
product_variables: {
native_coverage: {
src: "seccomp_policy/code_coverage.arm.policy",
},
},
},
x86: {
src: "empty_policy/code_coverage.x86_64.policy",
product_variables: {
native_coverage: {
src: "seccomp_policy/code_coverage.x86_64.policy",
},
},
},
x86_64: {
src: "empty_policy/code_coverage.x86.policy",
product_variables: {
native_coverage: {
src: "seccomp_policy/code_coverage.x86.policy",
},
},
},
},
}

View file

@ -1,37 +0,0 @@
# policies to allow processes inside minijail to dump code coverage information
#
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := code_coverage.policy
LOCAL_MODULE_CLASS := ETC
LOCAL_MULTILIB := both
ifeq ($(TARGET_ARCH), $(filter $(TARGET_ARCH), arm arm64))
LOCAL_MODULE_STEM_32 := code_coverage.arm.policy
LOCAL_MODULE_STEM_64 := code_coverage.arm64.policy
endif
ifeq ($(TARGET_ARCH), $(filter $(TARGET_ARCH), x86 x86_64))
LOCAL_MODULE_STEM_32 := code_coverage.x86.policy
LOCAL_MODULE_STEM_64 := code_coverage.x86_64.policy
endif
# different files for different configurations
ifeq ($(NATIVE_COVERAGE),true)
LOCAL_SRC_FILES_arm := seccomp_policy/code_coverage.arm.policy
LOCAL_SRC_FILES_arm64 := seccomp_policy/code_coverage.arm64.policy
LOCAL_SRC_FILES_x86 := seccomp_policy/code_coverage.x86.policy
LOCAL_SRC_FILES_x86_64 := seccomp_policy/code_coverage.x86_64.policy
else
LOCAL_SRC_FILES_arm := empty_policy/code_coverage.arm.policy
LOCAL_SRC_FILES_arm64 := empty_policy/code_coverage.arm64.policy
LOCAL_SRC_FILES_x86 := empty_policy/code_coverage.x86.policy
LOCAL_SRC_FILES_x86_64 := empty_policy/code_coverage.x86_64.policy
endif
LOCAL_MODULE_TARGET_ARCH := arm arm64 x86 x86_64
LOCAL_MODULE_PATH := $(TARGET_OUT)/etc/seccomp_policy
include $(BUILD_PREBUILT)