widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix prebuilt apexes" into udc-dev

Browse Source
This commit is contained in:
Kyle Zhang
2023-04-27 21:21:11 +00:00
committed by Android (Google) Code Review
parent c01cd91d92 71781924e8
commit 5409567ef9
1 changed files with 11 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
libwvdrmengine/apex/prebuilt/Android.bp
View File

@@ -24,62 +24,36 @@ package {
default_applicable_licenses: ["vendor_widevine_license"], default_applicable_licenses: ["vendor_widevine_license"],
} }
soong_config_module_type_import { apex_set {
from: "packages/modules/common/Android.bp",
module_types: ["module_apex_set"],
}
module_apex_set {
name: "com.google.android.widevine.nonupdatable", name: "com.google.android.widevine.nonupdatable",
apex_name: "com.google.android.widevine", apex_name: "com.google.android.widevine",
owner: "google", owner: "google",
set: "com.google.android.widevine.nonupdatable.apks", set: "com.google.android.widevine.nonupdatable.apks",
prefer: true, vendor: true,
// TODO(b/251299786): the prerelease field should be removed once // TODO(b/251299786): the prerelease field should be removed once
// new api version is released, e.g. U(34). // new api version is released, e.g. U(34).
// This is a mitigation for apex extractor matching target sdk version // This is a mitigation for apex extractor matching target sdk version
// with current prerelease version. // with current prerelease version.
prerelease: true, prerelease: true,
soong_config_variables: { use_source_config_var: {
module_build_from_source: { config_namespace: "widevine_module",
prefer: false, var_name: "source_build",
},
}, },
} }
module_apex_set { apex_set {
name: "com.google.android.widevine.lazy", name: "com.google.android.widevine.lazy",
apex_name: "com.google.android.widevine.lazy", apex_name: "com.google.android.widevine.lazy",
owner: "google", owner: "google",
set: "com.google.android.widevine.lazy.apks", set: "com.google.android.widevine.lazy.apks",
prefer: true, vendor: true,
// TODO(b/251299786): the prerelease field should be removed once // TODO(b/251299786): the prerelease field should be removed once
// new api version is released, e.g. U(34). // new api version is released, e.g. U(34).
// This is a mitigation for apex extractor matching target sdk version // This is a mitigation for apex extractor matching target sdk version
// with current prerelease version. // with current prerelease version.
prerelease: true, prerelease: true,
soong_config_variables: { use_source_config_var: {
module_build_from_source: { config_namespace: "widevine_module",
prefer: false, var_name: "source_build",
},
}, },
} }
module_apex_set {
name: "com.google.android.widevine",
apex_name: "com.google.android.widevine",
owner: "google",
set: "com.google.android.widevine.apks",
prefer: true,
// TODO(b/251299786): the prerelease field should be removed once
// new api version is released, e.g. U(34).
// This is a mitigation for apex extractor matching target sdk version
// with current prerelease version.
prerelease: true,
soong_config_variables: {
module_build_from_source: {
prefer: false,
},
},
}