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

Commit 6adda095 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 9675941 from ef19b194 to udc-release 

Change-Id: I98e4b923d51309698ca7969e80733b9f599bd690
parents e5edc8e6 ef19b194

cmds/atrace/atrace.rc

+97 −0
Original line number Diff line number Diff line
@@ -411,6 +411,103 @@ on post-fs-data && property:persist.mm_events.enabled=true 
    chmod 0666 /sys/kernel/debug/tracing/instances/mm_events/per_cpu/cpu23/trace

    chmod 0666 /sys/kernel/tracing/instances/mm_events/per_cpu/cpu23/trace



# Handle hyp tracing instance

on late-init && property:ro.boot.hypervisor.vm.supported=1



# Hypervisor tracing instance doesn't support changing trace_clock

    chmod 0440 /sys/kernel/debug/tracing/hyp/trace_clock

    chmod 0440 /sys/kernel/tracing/hyp/trace_clock



    chmod 0660 /sys/kernel/debug/tracing/hyp/buffer_size_kb

    chmod 0660 /sys/kernel/tracing/hyp/buffer_size_kb



    chmod 0660 /sys/kernel/debug/tracing/hyp/tracing_on

    chmod 0660 /sys/kernel/tracing/hyp/tracing_on



# Tracing disabled by default

    write /sys/kernel/debug/tracing/hyp/tracing_on 0

    write /sys/kernel/tracing/hyp/tracing_on 0



# Read and truncate the hyp trace.

    chmod 0660 /sys/kernel/debug/tracing/hyp/trace

    chmod 0660 /sys/kernel/tracing/hyp/trace



# Read and truncate the per-CPU kernel trace.

# Cannot use wildcards in .rc files. Update this if there is a phone with

# TODO(b/249050813, ioffe): introduce per-cpu wildcard

    chmod 0660 /sys/kernel/debug/tracing/hyp/per_cpu/cpu0/trace

    chmod 0660 /sys/kernel/tracing/hyp/per_cpu/cpu0/trace

    chmod 0660 /sys/kernel/debug/tracing/hyp/per_cpu/cpu1/trace

    chmod 0660 /sys/kernel/tracing/hyp/per_cpu/cpu1/trace

    chmod 0660 /sys/kernel/debug/tracing/hyp/per_cpu/cpu2/trace

    chmod 0660 /sys/kernel/tracing/hyp/per_cpu/cpu2/trace

    chmod 0660 /sys/kernel/debug/tracing/hyp/per_cpu/cpu3/trace

    chmod 0660 /sys/kernel/tracing/hyp/per_cpu/cpu3/trace

    chmod 0660 /sys/kernel/debug/tracing/hyp/per_cpu/cpu4/trace

    chmod 0660 /sys/kernel/tracing/hyp/per_cpu/cpu4/trace

    chmod 0660 /sys/kernel/debug/tracing/hyp/per_cpu/cpu5/trace

    chmod 0660 /sys/kernel/tracing/hyp/per_cpu/cpu5/trace

    chmod 0660 /sys/kernel/debug/tracing/hyp/per_cpu/cpu6/trace

    chmod 0660 /sys/kernel/tracing/hyp/per_cpu/cpu6/trace

    chmod 0660 /sys/kernel/debug/tracing/hyp/per_cpu/cpu7/trace

    chmod 0660 /sys/kernel/tracing/hyp/per_cpu/cpu7/trace

    chmod 0660 /sys/kernel/debug/tracing/hyp/per_cpu/cpu8/trace

    chmod 0660 /sys/kernel/tracing/hyp/per_cpu/cpu8/trace

    chmod 0660 /sys/kernel/debug/tracing/hyp/per_cpu/cpu9/trace

    chmod 0660 /sys/kernel/tracing/hyp/per_cpu/cpu9/trace

    chmod 0660 /sys/kernel/debug/tracing/hyp/per_cpu/cpu10/trace

    chmod 0660 /sys/kernel/tracing/hyp/per_cpu/cpu10/trace

    chmod 0660 /sys/kernel/debug/tracing/hyp/per_cpu/cpu11/trace

    chmod 0660 /sys/kernel/tracing/hyp/per_cpu/cpu11/trace

    chmod 0660 /sys/kernel/debug/tracing/hyp/per_cpu/cpu12/trace

    chmod 0660 /sys/kernel/tracing/hyp/per_cpu/cpu12/trace

    chmod 0660 /sys/kernel/debug/tracing/hyp/per_cpu/cpu13/trace

    chmod 0660 /sys/kernel/tracing/hyp/per_cpu/cpu13/trace

    chmod 0660 /sys/kernel/debug/tracing/hyp/per_cpu/cpu14/trace

    chmod 0660 /sys/kernel/tracing/hyp/per_cpu/cpu14/trace

    chmod 0660 /sys/kernel/debug/tracing/hyp/per_cpu/cpu15/trace

    chmod 0660 /sys/kernel/tracing/hyp/per_cpu/cpu15/trace

    chmod 0660 /sys/kernel/debug/tracing/hyp/per_cpu/cpu16/trace

    chmod 0660 /sys/kernel/tracing/hyp/per_cpu/cpu16/trace

    chmod 0660 /sys/kernel/debug/tracing/hyp/per_cpu/cpu17/trace

    chmod 0660 /sys/kernel/tracing/hyp/per_cpu/cpu17/trace

    chmod 0660 /sys/kernel/debug/tracing/hyp/per_cpu/cpu18/trace

    chmod 0660 /sys/kernel/tracing/hyp/per_cpu/cpu18/trace

    chmod 0660 /sys/kernel/debug/tracing/hyp/per_cpu/cpu19/trace

    chmod 0660 /sys/kernel/tracing/hyp/per_cpu/cpu19/trace

    chmod 0660 /sys/kernel/debug/tracing/hyp/per_cpu/cpu20/trace

    chmod 0660 /sys/kernel/tracing/hyp/per_cpu/cpu20/trace

    chmod 0660 /sys/kernel/debug/tracing/hyp/per_cpu/cpu21/trace

    chmod 0660 /sys/kernel/tracing/hyp/per_cpu/cpu21/trace

    chmod 0660 /sys/kernel/debug/tracing/hyp/per_cpu/cpu22/trace

    chmod 0660 /sys/kernel/tracing/hyp/per_cpu/cpu22/trace

    chmod 0660 /sys/kernel/debug/tracing/hyp/per_cpu/cpu23/trace

    chmod 0660 /sys/kernel/tracing/hyp/per_cpu/cpu23/trace



    chmod 0440 /sys/kernel/debug/tracing/hyp/events/header_page

    chmod 0440 /sys/kernel/tracing/hyp/events/header_page



# Hyp events start here



# hyp_enter event

    chmod 0660 /sys/kernel/debug/tracing/hyp/events/hyp/hyp_enter/enable

    chmod 0660 /sys/kernel/tracing/hyp/events/hyp/hyp_enter/enable

# TODO(b/249050813): should this be handled in kernel?

    chmod 0440 /sys/kernel/debug/tracing/hyp/events/hyp/hyp_enter/format

    chmod 0440 /sys/kernel/tracing/hyp/events/hyp/hyp_enter/format

    chmod 0440 /sys/kernel/debug/tracing/hyp/events/hyp/hyp_enter/id

    chmod 0440 /sys/kernel/tracing/hyp/events/hyp/hyp_enter/id



# hyp_exit event

    chmod 0660 /sys/kernel/debug/tracing/hyp/events/hyp/hyp_exit/enable

    chmod 0660 /sys/kernel/tracing/hyp/events/hyp/hyp_exit/enable

# TODO(b/249050813): should this be handled in kernel?

    chmod 0440 /sys/kernel/debug/tracing/hyp/events/hyp/hyp_exit/format

    chmod 0440 /sys/kernel/tracing/hyp/events/hyp/hyp_exit/format

    chmod 0440 /sys/kernel/debug/tracing/hyp/events/hyp/hyp_exit/id

    chmod 0440 /sys/kernel/tracing/hyp/events/hyp/hyp_exit/id





on property:persist.debug.atrace.boottrace=1

    start boottrace

headers/media_plugin/media/openmax/OMX_AsString.h

+1 −0
Original line number Diff line number Diff line
@@ -561,6 +561,7 @@ inline static const char *asString(OMX_INDEXEXTTYPE i, const char *def = "??") { 
        case OMX_IndexConfigPriority:                   return "ConfigPriority";

        case OMX_IndexConfigOperatingRate:              return "ConfigOperatingRate";

        case OMX_IndexParamConsumerUsageBits:           return "ParamConsumerUsageBits";

        case OMX_IndexParamConsumerUsageBits64:         return "ParamConsumerUsageBits64";

        case OMX_IndexConfigLatency:                    return "ConfigLatency";

        default:                                        return asString((OMX_INDEXTYPE)i, def);

    }

headers/media_plugin/media/openmax/OMX_IndexExt.h

+1 −0
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ typedef enum OMX_INDEXEXTTYPE { 
    OMX_IndexConfigLowLatency,                      /**< reference: OMX_CONFIG_BOOLEANTYPE */

    OMX_IndexConfigAndroidTunnelPeek,               /**< reference: OMX_CONFIG_BOOLEANTYPE */

    OMX_IndexConfigAndroidTunnelPeekLegacyMode,     /**< reference: OMX_CONFIG_BOOLEANTYPE */

    OMX_IndexParamConsumerUsageBits64,              /**< reference: OMX_PARAM_U64TYPE */

    OMX_IndexExtOtherEndUnused,



    /* Time configurations */

libs/binder/rust/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ rust_library { 
    ],

    host_supported: true,

    vendor_available: true,

    product_available: true,

    target: {

        darwin: {

            enabled: false,
@@ -72,6 +73,7 @@ rust_library { 
    ],

    host_supported: true,

    vendor_available: true,

    product_available: true,

    target: {

        darwin: {

            enabled: false,
@@ -129,6 +131,7 @@ rust_bindgen { 
    ],

    host_supported: true,

    vendor_available: true,

    product_available: true,



    // Currently necessary for host builds

    // TODO(b/31559095): bionic on host should define this

libs/binder/rust/src/native.rs

+4 −4
Original line number Diff line number Diff line
@@ -209,8 +209,8 @@ impl<T: Remotable> Binder<T> { 
    }



    /// Mark this binder object with local stability, which is vendor if we are

    /// building for the VNDK and system otherwise.

    #[cfg(any(vendor_ndk, android_vndk))]

    /// building for android_vendor and system otherwise.

    #[cfg(android_vendor)]

    fn mark_local_stability(&mut self) {

        unsafe {

            // Safety: Self always contains a valid `AIBinder` pointer, so
@@ -220,8 +220,8 @@ impl<T: Remotable> Binder<T> { 
    }



    /// Mark this binder object with local stability, which is vendor if we are

    /// building for the VNDK and system otherwise.

    #[cfg(not(any(vendor_ndk, android_vndk)))]

    /// building for android_vendor and system otherwise.

    #[cfg(not(android_vendor))]

    fn mark_local_stability(&mut self) {

        unsafe {

            // Safety: Self always contains a valid `AIBinder` pointer, so