Merge "Install VINTF fragments over module" into main (36418e41) · Commits · e / os / android_hardware_interfaces

security/keymint/aidl/default/Android.bp

+0 −12

Original line number	Original line	Diff line number	Diff line
	@@ -192,7 +192,6 @@ apex {
	],		],
	prebuilts: [		prebuilts: [
	"keymint_aidl_nonsecure_init_rc",		"keymint_aidl_nonsecure_init_rc",
	"keymint_aidl_nonsecure_vintf",
	"android.hardware.hardware_keystore.xml", // permissions		"android.hardware.hardware_keystore.xml", // permissions
	],		],
	}		}
	@@ -210,14 +209,3 @@ genrule {
	out: ["android.hardware.security.keymint-service.nonsecure.apex.rc"],		out: ["android.hardware.security.keymint-service.nonsecure.apex.rc"],
	cmd: "sed -E 's%/vendor/bin/%/apex/com.android.hardware.keymint/bin/%' $(in) > $(out)",		cmd: "sed -E 's%/vendor/bin/%/apex/com.android.hardware.keymint/bin/%' $(in) > $(out)",
	}		}

	prebuilt_etc {
	name: "keymint_aidl_nonsecure_vintf",
	sub_dir: "vintf",
	vendor: true,
	srcs: [
	"android.hardware.security.keymint-service.xml",
	"android.hardware.security.sharedsecret-service.xml",
	"android.hardware.security.secureclock-service.xml",
	],
	}

+0 −8

Original line number	Original line	Diff line number	Diff line
	@@ -15,13 +15,6 @@ prebuilt_etc {
	installable: false,		installable: false,
	}		}

	prebuilt_etc {
	name: "com.android.hardware.wifi.xml",
	src: ":default-android.hardware.wifi-service.xml",
	installable: false,
	sub_dir: "vintf",
	}

	apex {		apex {
	name: "com.android.hardware.wifi",		name: "com.android.hardware.wifi",
	manifest: "apex_manifest.json",		manifest: "apex_manifest.json",
	@@ -36,7 +29,6 @@ apex {
	],		],
	prebuilts: [		prebuilts: [
	"com.android.hardware.wifi.rc",		"com.android.hardware.wifi.rc",
	"com.android.hardware.wifi.xml",
	],		],
	overrides: [		overrides: [
	"android.hardware.wifi-service",		"android.hardware.wifi-service",