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

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

Snap for 12800583 from b911aa5c to 25Q2-release 

Change-Id: I612116adc5ea4b87f501c11950f5da93436bde51
parents 1f8a9761 b911aa5c

include/android/performance_hint.h

+7 −2
Original line number Diff line number Diff line
@@ -478,8 +478,13 @@ void AWorkDuration_setActualGpuDurationNanos(AWorkDuration* _Nonnull aWorkDurati 
/**

 * Return the APerformanceHintSession wrapped by a Java PerformanceHintManager.Session object.

 *

 * The Java session maintains ownership over the wrapped native session, so it cannot be

 * closed using {@link APerformanceHint_closeSession}.

 * The Java session maintains ownership over the wrapped native session, so it cannot be closed

 * using {@link APerformanceHint_closeSession}. The return value is valid until the Java object

 * containing this value dies.

 *

 * The returned pointer is intended to be used by JNI calls to access native performance APIs using

 * a Java hint session wrapper, and then immediately discarded. Using the pointer after the death of

 * the Java container results in undefined behavior.

 *

 * @param env The Java environment where the PerformanceHintManager.Session lives.

 * @param sessionObj The Java Session to unwrap.

libs/binder/rust/src/lib.rs

+2 −2
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ mod proxy; 
mod service;

#[cfg(not(any(trusty, android_ndk)))]

mod state;

#[cfg(not(any(android_vendor, android_ndk, android_vndk)))]

#[cfg(not(any(android_vendor, android_ndk, android_vndk, trusty)))]

mod system_only;



use binder_ndk_sys as sys;
@@ -125,7 +125,7 @@ pub use service::{ 
pub use service::{get_interface, get_service};

#[cfg(not(any(trusty, android_ndk)))]

pub use state::{ProcessState, ThreadState};

#[cfg(not(any(android_vendor, android_vndk, android_ndk)))]

#[cfg(not(any(android_vendor, android_vndk, android_ndk, trusty)))]

pub use system_only::{delegate_accessor, Accessor, AccessorProvider, ConnectionInfo};



/// Binder result containing a [`Status`] on error.

libs/binder/trusty/rules.mk

+12 −2
Original line number Diff line number Diff line
@@ -64,14 +64,24 @@ MODULE_EXPORT_INCLUDES += \ 
MODULE_EXPORT_INCLUDES += \

	$(LIBBINDER_DIR)/ndk/include_cpp \



ifeq (false,$(call TOBOOL,$(USE_SYSTEM_BINDER)))

BINDER_EXTRA_COMPILE_FLAGS := \

	-D__ANDROID_VENDOR__ \

	-D__ANDROID_VNDK__ \



else

BINDER_EXTRA_COMPILE_FLAGS := \

	-DANDROID_PLATFORM \



endif



MODULE_EXPORT_COMPILEFLAGS += \

	-DBINDER_RPC_SINGLE_THREADED \

	-DBINDER_ENABLE_LIBLOG_ASSERT \

	-DBINDER_DISABLE_NATIVE_HANDLE \

	-DBINDER_DISABLE_BLOB \

	-DBINDER_NO_LIBBASE \

	-D__ANDROID_VENDOR__ \

	-D__ANDROID_VNDK__ \

	$(BINDER_EXTRA_COMPILE_FLAGS)



# libbinder has some deprecated declarations that we want to produce warnings

# not errors

libs/binder/trusty/rust/binder_ndk_sys/rules.mk

+6 −1
Original line number Diff line number Diff line
@@ -30,9 +30,14 @@ MODULE_LIBRARY_DEPS += \ 
	trusty/user/base/lib/trusty-sys \



MODULE_RUSTFLAGS += \

	--cfg 'android_vendor' \

	--cfg 'trusty' \



ifeq (false,$(call TOBOOL,$(USE_SYSTEM_BINDER)))

MODULE_RUSTFLAGS += \

	--cfg 'android_vendor' \



endif



MODULE_BINDGEN_SRC_HEADER := $(LIBBINDER_DIR)/rust/sys/BinderBindings.hpp



# Add the flags from the flag file

libs/binder/trusty/rust/rules.mk

+7 −1
Original line number Diff line number Diff line
@@ -32,9 +32,15 @@ MODULE_LIBRARY_DEPS += \ 
	trusty/user/base/lib/trusty-sys \



MODULE_RUSTFLAGS += \

	--cfg 'android_vendor' \

	--cfg 'trusty' \



ifeq (false,$(call TOBOOL,$(USE_SYSTEM_BINDER)))

MODULE_RUSTFLAGS += \

	--cfg 'android_vendor' \



endif





# Trusty does not have `ProcessState`, so there are a few

# doc links in `IBinder` that are still broken.

MODULE_RUSTFLAGS += \