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

Merge "Widevine apex cleanup" into udc-dev am: 630fbd2251 am: f370c03a03 am: fb3eb7a5af

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22938238

Change-Id: If93991fe66edbbf8d188c5e47be91a9aa698f42a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-05-03 21:08:28 +00:00
committed by Automerger Merge Worker
parent 3d59829baa fb3eb7a5af
commit 35dce6aa58
2 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libwvdrmengine/apex/device/device.mk
View File

@@ -1,8 +1,10 @@
# Declare source_build soong config variable. # by default use source
# Usage: widevine_use_source := true
# Pass `SOONG_CONFIG_widevine_module_source_build=true` to build the Widevine ifeq ($(TARGET_BUILD_WIDEVINE_USE_PREBUILT),true)
# APEX from source. widevine_use_source := false
$(call soong_config_set,widevine_module,source_build,$(call soong_config_get,widevine_module,source_build)) endif
$(call soong_config_set,widevine,source_build,$(widevine_use_source))
widevine_use_source := true
ifeq ($(TARGET_BUILD_WIDEVINE),nonupdatable) ifeq ($(TARGET_BUILD_WIDEVINE),nonupdatable)
PRODUCT_PACKAGES += com.google.android.widevine.nonupdatable PRODUCT_PACKAGES += com.google.android.widevine.nonupdatable

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

@@ -30,13 +30,8 @@ apex_set {
owner: "google", owner: "google",
set: "com.google.android.widevine.nonupdatable.apks", set: "com.google.android.widevine.nonupdatable.apks",
vendor: true, vendor: 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,
use_source_config_var: { use_source_config_var: {
config_namespace: "widevine_module", config_namespace: "widevine",
var_name: "source_build", var_name: "source_build",
}, },
} }
@@ -47,13 +42,8 @@ apex_set {
owner: "google", owner: "google",
set: "com.google.android.widevine.lazy.apks", set: "com.google.android.widevine.lazy.apks",
vendor: true, vendor: 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,
use_source_config_var: { use_source_config_var: {
config_namespace: "widevine_module", config_namespace: "widevine",
var_name: "source_build", var_name: "source_build",
}, },
} }