From dc9fbae1b4199010314e669179428729b6047036 Mon Sep 17 00:00:00 2001
From: Kyle Zhang <kelzhan@google.com>
Date: Fri, 28 Apr 2023 22:52:16 +0000
Subject: [PATCH] Widevine apex cleanup

1. Remove prerelease tag.
2. Add TARGET_BUILD_WIDEVINE_USE_PREBUILT to control building from source.
3. Unify config namespace to "widevine".

Bug: 251299786
Bug: 277764729
Change-Id: I2f19bcf8efd280a1a3aa86f595599d79e20b4ff4
---
 libwvdrmengine/apex/device/device.mk    | 12 +++++++-----
 libwvdrmengine/apex/prebuilt/Android.bp | 14 ++------------
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/libwvdrmengine/apex/device/device.mk b/libwvdrmengine/apex/device/device.mk
index f7c3600e..7bf73c19 100644
--- a/libwvdrmengine/apex/device/device.mk
+++ b/libwvdrmengine/apex/device/device.mk
@@ -1,8 +1,10 @@
-# Declare source_build soong config variable.
-# Usage:
-#   Pass `SOONG_CONFIG_widevine_module_source_build=true` to build the Widevine
-#   APEX from source.
-$(call soong_config_set,widevine_module,source_build,$(call soong_config_get,widevine_module,source_build))
+# by default use source
+widevine_use_source := true
+ifeq ($(TARGET_BUILD_WIDEVINE_USE_PREBUILT),true)
+  widevine_use_source := false
+endif
+$(call soong_config_set,widevine,source_build,$(widevine_use_source))
+widevine_use_source := true
 
 ifeq ($(TARGET_BUILD_WIDEVINE),nonupdatable)
 PRODUCT_PACKAGES += com.google.android.widevine.nonupdatable
diff --git a/libwvdrmengine/apex/prebuilt/Android.bp b/libwvdrmengine/apex/prebuilt/Android.bp
index 140647b7..58e05f5a 100644
--- a/libwvdrmengine/apex/prebuilt/Android.bp
+++ b/libwvdrmengine/apex/prebuilt/Android.bp
@@ -30,13 +30,8 @@ apex_set {
     owner: "google",
     set: "com.google.android.widevine.nonupdatable.apks",
     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: {
-        config_namespace: "widevine_module",
+        config_namespace: "widevine",
         var_name: "source_build",
     },
 }
@@ -47,13 +42,8 @@ apex_set {
     owner: "google",
     set: "com.google.android.widevine.lazy.apks",
     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: {
-        config_namespace: "widevine_module",
+        config_namespace: "widevine",
         var_name: "source_build",
     },
 }
\ No newline at end of file