Merge "Adding vintf fragment to the apex"

This commit is contained in:
TreeHugger Robot
2022-10-27 23:56:28 +00:00
committed by Android (Google) Code Review

View File

@@ -66,14 +66,13 @@ apex {
prebuilts: [ prebuilts: [
"com.google.android.widevine.rc", "com.google.android.widevine.rc",
"widevine-linker-config", "widevine-linker-config",
"com.google.android.widevine.xml", // etc/vintf
], ],
defaults: [ defaults: [
"com.google.android.widevine-defaults", "com.google.android.widevine-defaults",
"com.google.android.widevine-key-defaults", "com.google.android.widevine-key-defaults",
], ],
binaries: ["android.hardware.drm-service.widevine"], binaries: ["android.hardware.drm-service.widevine"],
// TODO(b/239054171) embed vintf_fragment in the apex.
vintf_fragments: ["com.google.android.widevine.xml"],
file_contexts: "file_contexts", file_contexts: "file_contexts",
use_vndk_as_stable: true, use_vndk_as_stable: true,
updatable: false, updatable: false,
@@ -106,6 +105,13 @@ prebuilt_etc {
src: "com.google.android.widevine.rc", src: "com.google.android.widevine.rc",
} }
prebuilt_etc {
name: "com.google.android.widevine.xml",
src: "com.google.android.widevine.xml",
sub_dir: "vintf",
installable: false,
}
prebuilt_etc { prebuilt_etc {
name: "allowlist_com.google.android.widevine.xml", name: "allowlist_com.google.android.widevine.xml",
src: "allowlist_com.google.android.widevine.xml", src: "allowlist_com.google.android.widevine.xml",