Merge "Add latest version bcradio HAL defaults" into main (8658252b) · Commits · e / os / android_hardware_interfaces

broadcastradio/aidl/Android.bp

+17 −0

Original line number	Diff line number	Diff line
		@@ -51,3 +51,20 @@ aidl_interface {
		frozen: true,

		}

		// Note: This should always be one version ahead of the last frozen version
		latest_android_hardware_broadcastradio = "android.hardware.broadcastradio-V2"

		cc_defaults {
		name: "latest_android_hardware_broadcastradio_ndk_static",
		static_libs: [
		latest_android_hardware_broadcastradio + "-ndk",
		],
		}

		java_defaults {
		name: "latest_android_hardware_broadcastradio_java_static",
		static_libs: [
		latest_android_hardware_broadcastradio + "-java",
		],
		}

+6 −3

Original line number	Diff line number	Diff line
		@@ -20,14 +20,17 @@ package {
		// all of the 'license_kinds' from "hardware_interfaces_license"
		// to get the below license kinds:
		// SPDX-license-identifier-Apache-2.0
		default_team: "trendy_team_aaos_framework",
		default_applicable_licenses: ["hardware_interfaces_license"],
		}

		cc_defaults {
		name: "BroadcastRadioHalDefaults",
		defaults: [
		"latest_android_hardware_broadcastradio_ndk_static",
		],
		static_libs: [
		"android.hardware.broadcastradio-V2-ndk",
		"android.hardware.broadcastradio@common-utils-aidl-lib-V2",
		"android.hardware.broadcastradio@common-utils-aidl-lib-latest",
		"android.hardware.broadcastradio@common-utils-lib",
		],
		shared_libs: [
		@@ -79,12 +82,12 @@ cc_fuzz {
		// TODO(b/307611931): avoid fuzzing on vendor until hermiticity issue is fixed
		// vendor: true,
		defaults: [
		"latest_android_hardware_broadcastradio_ndk_static",
		"BroadcastRadioHalDefaults",
		"service_fuzzer_defaults",
		],
		static_libs: [
		"DefaultBroadcastRadioHal",
		"android.hardware.broadcastradio-V2-ndk",
		],
		srcs: [
		"fuzzer.cpp",

+3 −3

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package {
		// all of the 'license_kinds' from "hardware_interfaces_license"
		// to get the below license kinds:
		// SPDX-license-identifier-Apache-2.0
		default_team: "trendy_team_aaos_framework",
		default_applicable_licenses: ["hardware_interfaces_license"],
		}

		@@ -25,6 +26,7 @@ cc_test {
		name: "VtsHalBroadcastradioAidlTargetTest",
		defaults: [
		"VtsHalTargetTestDefaults",
		"latest_android_hardware_broadcastradio_ndk_static",
		"use_libaidlvintf_gtest_helper_static",
		],
		tidy_timeout_srcs: ["src/*.cpp"],
		@@ -35,9 +37,7 @@ cc_test {
		"libxml2",
		],
		static_libs: [
		"android.hardware.broadcastradio-V2-ndk",
		"android.hardware.broadcastradio@common-utils-aidl-lib-V2",
		"android.hardware.broadcastradio@vts-utils-lib",
		"android.hardware.broadcastradio@common-utils-aidl-lib-latest",
		"libgmock",
		],
		test_suites: [

+13 −2

Original line number	Diff line number	Diff line
		@@ -47,17 +47,28 @@ cc_library_static {
		],
		}

		cc_library_static {
		name: "android.hardware.broadcastradio@common-utils-aidl-lib-latest",
		defaults: [
		"BroadcastRadioUtilsDefaults",
		"latest_android_hardware_broadcastradio_ndk_static",
		],
		srcs: [
		"src/UtilsV2.cpp",
		],
		}

		cc_test {
		name: "broadcastradio_utils_aidl_test",
		defaults: [
		"BroadcastRadioUtilsDefaults",
		"latest_android_hardware_broadcastradio_ndk_static",
		],
		srcs: [
		"test/*.cpp",
		],
		static_libs: [
		"android.hardware.broadcastradio@common-utils-aidl-lib-V2",
		"android.hardware.broadcastradio-V2-ndk",
		"android.hardware.broadcastradio@common-utils-aidl-lib-latest",
		],
		test_suites: ["general-tests"],
		}