Use devkeys for widevine apex only if they are available
In partner branches devkeys are not available. Use devkeys only when they are available. Otherwise, use testkeys. Bug: 249309699 Test: m com.google.android.widevine Change-Id: I75fd50fe78d0fd2e797275c50ddf00b116700178
This commit is contained in:
@@ -39,24 +39,43 @@ widevine_apex_defaults {
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
soong_config_module_type {
|
||||||
|
name: "widevine_key_apex_defaults",
|
||||||
|
module_type: "apex_defaults",
|
||||||
|
config_namespace: "widevine",
|
||||||
|
bool_variables: ["use_devkey"],
|
||||||
|
properties: ["key", "certificate"],
|
||||||
|
}
|
||||||
|
|
||||||
|
widevine_key_apex_defaults {
|
||||||
|
name: "com.google.android.widevine-key-defaults",
|
||||||
|
key: "com.google.android.widevine.key",
|
||||||
|
certificate: ":com.google.android.widevine.certificate",
|
||||||
|
soong_config_variables: {
|
||||||
|
use_devkey: {
|
||||||
|
key: "com_google_android_widevine-image.key",
|
||||||
|
certificate: ":com_google_android_widevine-container",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
apex {
|
apex {
|
||||||
name: "com.google.android.widevine",
|
name: "com.google.android.widevine",
|
||||||
vendor: true,
|
vendor: true,
|
||||||
manifest: "apex_manifest.json",
|
manifest: "apex_manifest.json",
|
||||||
prebuilts: [
|
prebuilts: [
|
||||||
"com.google.android.widevine.rc",
|
"com.google.android.widevine.rc",
|
||||||
"widevine-linker-config",
|
"widevine-linker-config",
|
||||||
],
|
],
|
||||||
defaults: [
|
defaults: [
|
||||||
"com.google.android.widevine-defaults",
|
"com.google.android.widevine-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.
|
// TODO(b/239054171) embed vintf_fragment in the apex.
|
||||||
vintf_fragments: ["com.google.android.widevine.xml"],
|
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,
|
||||||
key: "com.google.android.widevine.key",
|
|
||||||
certificate: ":com.google.android.widevine.certificate",
|
|
||||||
updatable: false,
|
updatable: false,
|
||||||
|
|
||||||
// install sysconfig to allow the apex to be updatable
|
// install sysconfig to allow the apex to be updatable
|
||||||
|
|||||||
Reference in New Issue
Block a user