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

Commit 8175edf8 authored Nov 13, 2024 by David Drysdale Committed by Automerger Merge Worker Nov 13, 2024

Merge changes from topic "keymint-v3" into main am: 014c710c am: 735298c3

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3345023

Change-Id: Ibbe734353e7f31857be5337a045276d238f8d656
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents c1e9bc1a 735298c3

trusty/keymaster/Android.bp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -121,7 +121,7 @@ cc_binary {
	"libutils",		"libutils",
	],		],
	required: [		required: [
	"android.hardware.hardware_keystore.xml",		"android.hardware.hardware_keystore_V3.xml",
	],		],
	}		}

trusty/keymint/Android.bp

+4 −3

Original line number	Original line	Diff line number	Diff line
	@@ -42,9 +42,10 @@ rust_binary {
	defaults: ["android.hardware.security.keymint-service.rust.trusty.default"],		defaults: ["android.hardware.security.keymint-service.rust.trusty.default"],
	init_rc: ["android.hardware.security.keymint-service.rust.trusty.rc"],		init_rc: ["android.hardware.security.keymint-service.rust.trusty.rc"],
	vintf_fragments: ["android.hardware.security.keymint-service.rust.trusty.xml"],		vintf_fragments: ["android.hardware.security.keymint-service.rust.trusty.xml"],
	required: [		required: select(release_flag("RELEASE_AIDL_USE_UNFROZEN"), {
	"android.hardware.hardware_keystore.xml",		true: ["android.hardware.hardware_keystore.xml"],
	],		default: ["android.hardware.hardware_keystore_V3.xml"],
			}),
	}		}

	rust_binary {		rust_binary {