Merge "Use defaults to reference current keymint version" am: ddf63247e9 (2fedeb57) · Commits · e / os / android_hardware_interfaces

security/keymint/aidl/Android.bp

+27 −0

Original line number	Original line	Diff line number	Diff line
	@@ -38,3 +38,30 @@ aidl_interface {
	},		},
	versions: ["1"],		versions: ["1"],
	}		}

			// cc_defaults that includes the latest KeyMint AIDL library.
			// Modules that depend on KeyMint directly can include this cc_defaults to avoid
			// managing dependency versions explicitly.
			cc_defaults {
			name: "keymint_use_latest_hal_aidl_ndk_static",
			static_libs: [
			"android.hardware.security.keymint-V1-ndk",
			],
			}

			cc_defaults {
			name: "keymint_use_latest_hal_aidl_ndk_shared",
			shared_libs: [
			"android.hardware.security.keymint-V1-ndk",
			],
			}

			// A rust_defaults that includes the latest KeyMint AIDL library.
			// Modules that depend on KeyMint directly can include this cc_defaults to avoid
			// managing dependency versions explicitly.
			rust_defaults {
			name: "keymint_use_latest_hal_aidl_rust",
			rustlibs: [
			"android.hardware.security.keymint-V1-rust",
			],
			}

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -21,8 +21,10 @@ cc_binary {
	"-Wall",		"-Wall",
	"-Wextra",		"-Wextra",
	],		],
			defaults: [
			"keymint_use_latest_hal_aidl_ndk_shared",
			],
	shared_libs: [		shared_libs: [
	"android.hardware.security.keymint-V1-ndk",
	"android.hardware.security.sharedsecret-V1-ndk",		"android.hardware.security.sharedsecret-V1-ndk",
	"android.hardware.security.secureclock-V1-ndk",		"android.hardware.security.secureclock-V1-ndk",
	"libbase",		"libbase",

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -26,6 +26,7 @@ package {
	cc_defaults {		cc_defaults {
	name: "keymint_vts_defaults",		name: "keymint_vts_defaults",
	defaults: [		defaults: [
			"keymint_use_latest_hal_aidl_ndk_static",
	"use_libaidlvintf_gtest_helper_static",		"use_libaidlvintf_gtest_helper_static",
	"VtsHalTargetTestDefaults",		"VtsHalTargetTestDefaults",
	],		],
	@@ -34,7 +35,6 @@ cc_defaults {
	"libcrypto",		"libcrypto",
	],		],
	static_libs: [		static_libs: [
	"android.hardware.security.keymint-V1-ndk",
	"android.hardware.security.secureclock-V1-ndk",		"android.hardware.security.secureclock-V1-ndk",
	"libcppbor_external",		"libcppbor_external",
	"libcppcose_rkp",		"libcppcose_rkp",

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -27,6 +27,7 @@ cc_benchmark {
	name: "VtsAidlKeyMintBenchmarkTest",		name: "VtsAidlKeyMintBenchmarkTest",
	defaults: [		defaults: [
	"VtsHalTargetTestDefaults",		"VtsHalTargetTestDefaults",
			"keymint_use_latest_hal_aidl_ndk_static",
	"use_libaidlvintf_gtest_helper_static",		"use_libaidlvintf_gtest_helper_static",
	],		],
	srcs: [		srcs: [
	@@ -39,7 +40,6 @@ cc_benchmark {
	"libkeymint_support",		"libkeymint_support",
	],		],
	static_libs: [		static_libs: [
	"android.hardware.security.keymint-V1-ndk",
	"android.hardware.security.secureclock-V1-ndk",		"android.hardware.security.secureclock-V1-ndk",
	"libcppbor_external",		"libcppbor_external",
	"libchrome",		"libchrome",

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -40,8 +40,10 @@ cc_library {
	export_include_dirs: [		export_include_dirs: [
	"include",		"include",
	],		],
			defaults: [
			"keymint_use_latest_hal_aidl_ndk_shared",
			],
	shared_libs: [		shared_libs: [
	"android.hardware.security.keymint-V1-ndk",
	"libbase",		"libbase",
	"libcrypto",		"libcrypto",
	"libutils",		"libutils",