Merge "Make libbinder_rs product_available" (4e4d8934) · Commits · e / os / platform_frameworks_native

libs/binder/rust/Android.bp

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -21,6 +21,7 @@ rust_library {
	],		],
	host_supported: true,		host_supported: true,
	vendor_available: true,		vendor_available: true,
			product_available: true,
	target: {		target: {
	darwin: {		darwin: {
	enabled: false,		enabled: false,
	@@ -72,6 +73,7 @@ rust_library {
	],		],
	host_supported: true,		host_supported: true,
	vendor_available: true,		vendor_available: true,
			product_available: true,
	target: {		target: {
	darwin: {		darwin: {
	enabled: false,		enabled: false,
	@@ -129,6 +131,7 @@ rust_bindgen {
	],		],
	host_supported: true,		host_supported: true,
	vendor_available: true,		vendor_available: true,
			product_available: true,

	// Currently necessary for host builds		// Currently necessary for host builds
	// TODO(b/31559095): bionic on host should define this		// TODO(b/31559095): bionic on host should define this

+4 −4

Original line number	Original line	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		/// Mark this binder object with local stability, which is vendor if we are
	/// building for the VNDK and system otherwise.		/// building for android_vendor and system otherwise.
	#[cfg(any(vendor_ndk, android_vndk))]		#[cfg(android_vendor)]
	fn mark_local_stability(&mut self) {		fn mark_local_stability(&mut self) {
	unsafe {		unsafe {
	// Safety: Self always contains a valid `AIBinder` pointer, so		// 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		/// Mark this binder object with local stability, which is vendor if we are
	/// building for the VNDK and system otherwise.		/// building for android_vendor and system otherwise.
	#[cfg(not(any(vendor_ndk, android_vndk)))]		#[cfg(not(android_vendor))]
	fn mark_local_stability(&mut self) {		fn mark_local_stability(&mut self) {
	unsafe {		unsafe {
	// Safety: Self always contains a valid `AIBinder` pointer, so		// Safety: Self always contains a valid `AIBinder` pointer, so