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

Unverified Commit 8715e68d authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

Merge tag 'android-10.0.0_r37' into staging/lineage-17.1_merge-android-10.0.0_r37 

Android 10.0.0 Release 37 (QQ3A.200605.001)

* tag 'android-10.0.0_r37':
  Add cpu-set properties to serializer test
  Allowing R and S developer GSI for DSU
  Adding new GSI public keys
  Increase timeouts.
  Add TEMP_FAILURE_RETRY where appropriate.
  Increase timeout to avoid flaky tests.
  configs for jailed procs to dump code coverage data
  Move gcov output to /data/misc/trace
  rootdir: init.rc to limit discard size to 128MB

Change-Id: I402131a51320e548dfd105d2223423e14a9e8ec4
parents 6ec9b912 41f8654b

code_coverage/Android.mk

0 → 100644
+37 −0
Original line number Diff line number Diff line 
# 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)

code_coverage/empty_policy/code_coverage.arm.policy

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

# code_coverage.arm.policy

code_coverage/empty_policy/code_coverage.arm64.policy

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

# code_coverage.arm64.policy

code_coverage/empty_policy/code_coverage.x86.policy

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

# code_coverage.x86.policy

code_coverage/empty_policy/code_coverage.x86_64.policy

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

# code_coverage.x86_64.policy