Snap for 11691493 from c8c4df5bf95fedea8f649a034d4b5ac42c39d5b1 to 24Q3-release (eaf0a526) · Commits · e / os / android_frameworks_native

cmds/dumpstate/Android.bp

+0 −3

Original line number	Diff line number	Diff line
		@@ -37,9 +37,6 @@ cc_library_shared {
		name: "libdumpstateutil",
		defaults: ["dumpstate_cflag_defaults"],
		vendor_available: true,
		vndk: {
		enabled: true,
		},
		srcs: [
		"DumpstateInternal.cpp",
		"DumpstateUtil.cpp",

+1 −3

Original line number	Diff line number	Diff line
		@@ -358,9 +358,6 @@ cc_library {

		// for vndbinder
		vendor_available: true,
		vndk: {
		enabled: true,
		},
		recovery_available: true,
		double_loadable: true,
		// TODO(b/153609531): remove when no longer needed.
		@@ -669,6 +666,7 @@ cc_library {
		"//packages/modules/Virtualization:__subpackages__",
		"//device/google/cuttlefish/shared/minidroid:__subpackages__",
		"//system/software_defined_vehicle:__subpackages__",
		"//visibility:any_system_partition",
		],
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -16,4 +16,5 @@

		[
		porttest("com.android.trusty.binderRpcTest"),
		porttest("com.android.trusty.rust.binder_rpc_test.test"),
		]

0 → 100644

+34 −0

Original line number	Diff line number	Diff line
		# Copyright (C) 2023 The Android Open Source Project
		#
		# Licensed under the Apache License, Version 2.0 (the "License");
		# you may not use this file except in compliance with the License.
		# You may obtain a copy of the License at
		#
		# http://www.apache.org/licenses/LICENSE-2.0
		#
		# Unless required by applicable law or agreed to in writing, software
		# distributed under the License is distributed on an "AS IS" BASIS,
		# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		# See the License for the specific language governing permissions and
		# limitations under the License.
		#

		LOCAL_DIR := $(GET_LOCAL_DIR)
		LIBBINDER_TESTS_DIR := $(LOCAL_DIR)/../../../../tests

		MODULE := $(LOCAL_DIR)

		MODULE_AIDL_LANGUAGE := rust

		MODULE_CRATE_NAME := binder_rpc_test_aidl

		MODULE_AIDLS := \
		$(LIBBINDER_TESTS_DIR)/BinderRpcTestClientInfo.aidl \
		$(LIBBINDER_TESTS_DIR)/BinderRpcTestServerConfig.aidl \
		$(LIBBINDER_TESTS_DIR)/BinderRpcTestServerInfo.aidl \
		$(LIBBINDER_TESTS_DIR)/IBinderRpcCallback.aidl \
		$(LIBBINDER_TESTS_DIR)/IBinderRpcSession.aidl \
		$(LIBBINDER_TESTS_DIR)/IBinderRpcTest.aidl \
		$(LIBBINDER_TESTS_DIR)/ParcelableCertificateData.aidl \

		include make/aidl.mk

0 → 100644

+36 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2023 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/
		#![cfg(test)]

		use binder::{IBinder, Strong};
		use binder_rpc_test_aidl::aidl::IBinderRpcTest::IBinderRpcTest;
		use rpcbinder::RpcSession;
		use trusty_std::ffi::{CString, FallibleCString};

		test::init!();

		const SERVICE_PORT: &str = "com.android.trusty.binderRpcTestService.V1";

		fn get_service() -> Strong<dyn IBinderRpcTest> {
		let port = CString::try_new(SERVICE_PORT).expect("Failed to allocate port name");
		RpcSession::new().setup_trusty_client(port.as_c_str()).expect("Failed to create session")
		}

		#[test]
		fn ping() {
		let srv = get_service();
		assert_eq!(srv.as_binder().ping_binder(), Ok(()));
		}