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

security/keymint/aidl/default/Android.bp

+0 −12

Original line number	Diff line number	Diff line
		@@ -192,7 +192,6 @@ apex {
		],
		prebuilts: [
		"keymint_aidl_nonsecure_init_rc",
		"keymint_aidl_nonsecure_vintf",
		"android.hardware.hardware_keystore.xml", // permissions
		],
		}
		@@ -210,14 +209,3 @@ genrule {
		out: ["android.hardware.security.keymint-service.nonsecure.apex.rc"],
		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	Diff line number	Diff line
		@@ -15,13 +15,6 @@ prebuilt_etc {
		installable: false,
		}

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

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