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

Use prefer for source vs prebuilts selection of widevine

Browse Source 
widevine currenty uses `use_source_config_var` and product variables to
ensure that products gets the correct selection of source or prebuilts
of widevine apex.

`use_source_config_var` is being deprecated from Soong to unfiy the
mechanisms for source vs prebuilt selection. This CL transitions
widevine to a different mechanism `prefer` for prebuilt selection to aid
the deprecation.

Test: lunch cf_x86_64_phone-trunk_staging-userdebug; m nothing; aninja
-t path droid
vendor/widevine/libwvdrmengine/apex/prebuilt/com.google.android.widevine.nonupdatable.apks;
// no path exists, i.e. uses source

Test: lunch osprey-trunk_staging-userdebug; m nothing; aninja -t path
droid vendor/widevine/libwvdrmengine/apex/prebuilt/com.google.android.widevine.nonupdatable.apks;
// path exists; i.e. uses prebuilts

Bug: 332379718

Change-Id: I78800aee49f1de83ea2ce8160923362871806d87
This commit is contained in:
Spandan Das
2024-04-18 17:07:45 +00:00
committed by Kyle Zhang
parent c5a48e1cf3
commit 1caf26737b
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,27 +25,39 @@ package {
default_applicable_licenses: ["vendor_widevine_license"], default_applicable_licenses: ["vendor_widevine_license"],
} }
apex_set { soong_config_module_type {
name: "widevine_apex_set",
module_type: "apex_set",
config_namespace: "widevine",
bool_variables: ["source_build"],
properties: ["prefer"],
}
widevine_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",
vendor: true, vendor: true,
use_source_config_var: { prefer: true,
config_namespace: "widevine", soong_config_variables: {
var_name: "source_build", source_build: {
prefer: false,
},
}, },
} }
apex_set { widevine_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",
vendor: true, vendor: true,
use_source_config_var: { prefer: true,
config_namespace: "widevine", soong_config_variables: {
var_name: "source_build", source_build: {
prefer: false,
},
}, },
} }