From d81cdbae427c87834e1dadc04fa15493669847de Mon Sep 17 00:00:00 2001
From: Robert Shih <robertshih@google.com>
Date: Thu, 3 Aug 2023 18:06:28 -0700
Subject: [PATCH] Update Widevine apex min_sdk_version to 34

Bug: 287567070
Bug: 294568360
Test: v2/widevine-eng/drm_compliance_apex
Change-Id: Iad45bf7a66ff0217724376aa8648ecd613af32c1
---
 libwvdrmengine/Android.bp                 | 6 +++---
 libwvdrmengine/apex/Android.bp            | 2 +-
 libwvdrmengine/apex/proto/Android.bp      | 2 +-
 libwvdrmengine/cdm/Android.bp             | 2 +-
 libwvdrmengine/cdm/core/src/Android.bp    | 2 +-
 libwvdrmengine/cdm/metrics/src/Android.bp | 2 +-
 libwvdrmengine/level3/Android.bp          | 2 +-
 libwvdrmengine/mediacrypto/Android.bp     | 2 +-
 libwvdrmengine/mediadrm/Android.bp        | 2 +-
 libwvdrmengine/oemcrypto/odk/Android.bp   | 2 +-
 10 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/libwvdrmengine/Android.bp b/libwvdrmengine/Android.bp
index c7b789bd..d9bdc2d6 100644
--- a/libwvdrmengine/Android.bp
+++ b/libwvdrmengine/Android.bp
@@ -94,7 +94,7 @@ cc_defaults {
     name: "common_widevine_service-multilib-defaults-aidl",
     owner: "widevine",
     proprietary: true,
-    min_sdk_version: "UpsideDownCake",
+    min_sdk_version: "34",
     relative_install_path: "hw",
     include_dirs: [
         "vendor/widevine/libwvdrmengine/cdm/core/include/",
@@ -227,7 +227,7 @@ cc_library_static {
         "lib_apex_manifest_minimal_proto_lite",
     ],
 
-    min_sdk_version: "UpsideDownCake",
+    min_sdk_version: "34",
 }
 
 // ----------------------------------------------------------------------------
@@ -290,7 +290,7 @@ cc_library {
     owner: "widevine",
 
     proprietary: true,
-    min_sdk_version: "UpsideDownCake",
+    min_sdk_version: "34",
 }
 
 phony {
diff --git a/libwvdrmengine/apex/Android.bp b/libwvdrmengine/apex/Android.bp
index e26cd0d3..1f6d20f5 100644
--- a/libwvdrmengine/apex/Android.bp
+++ b/libwvdrmengine/apex/Android.bp
@@ -47,7 +47,7 @@ widevine_apex_defaults {
     // we'll read apex_manifest.pb to get the version. To label apex_manifest.pb
     // as vendor_configs_file (which the apex can access), turn off force-label.
     use_file_contexts_as_is: true,
-    min_sdk_version: "UpsideDownCake",
+    min_sdk_version: "34",
     vendor: true,
 }
 
diff --git a/libwvdrmengine/apex/proto/Android.bp b/libwvdrmengine/apex/proto/Android.bp
index 25184d1c..bd3beef5 100644
--- a/libwvdrmengine/apex/proto/Android.bp
+++ b/libwvdrmengine/apex/proto/Android.bp
@@ -39,5 +39,5 @@ cc_library_static {
         "libbase",
     ],
     vendor: true,
-    min_sdk_version: "UpsideDownCake",
+    min_sdk_version: "34",
 }
diff --git a/libwvdrmengine/cdm/Android.bp b/libwvdrmengine/cdm/Android.bp
index 348ed9ff..b901a605 100644
--- a/libwvdrmengine/cdm/Android.bp
+++ b/libwvdrmengine/cdm/Android.bp
@@ -80,5 +80,5 @@ cc_library_static {
     ],
 
     proprietary: true,
-    min_sdk_version: "UpsideDownCake",
+    min_sdk_version: "34",
 }
diff --git a/libwvdrmengine/cdm/core/src/Android.bp b/libwvdrmengine/cdm/core/src/Android.bp
index 77c84584..b001ad59 100644
--- a/libwvdrmengine/cdm/core/src/Android.bp
+++ b/libwvdrmengine/cdm/core/src/Android.bp
@@ -35,5 +35,5 @@ cc_library {
     static_libs: ["libcdm_metrics_protos"],
     whole_static_libs: ["libcdm_metrics_protos"],
     export_static_lib_headers: ["libcdm_metrics_protos"],
-    min_sdk_version: "UpsideDownCake",
+    min_sdk_version: "34",
 }
diff --git a/libwvdrmengine/cdm/metrics/src/Android.bp b/libwvdrmengine/cdm/metrics/src/Android.bp
index 83f3dcd0..61754e58 100644
--- a/libwvdrmengine/cdm/metrics/src/Android.bp
+++ b/libwvdrmengine/cdm/metrics/src/Android.bp
@@ -67,5 +67,5 @@ cc_library {
         type: "full",
     },
 
-    min_sdk_version: "UpsideDownCake",
+    min_sdk_version: "34",
 }
diff --git a/libwvdrmengine/level3/Android.bp b/libwvdrmengine/level3/Android.bp
index 93ee2144..dcc8a3d0 100644
--- a/libwvdrmengine/level3/Android.bp
+++ b/libwvdrmengine/level3/Android.bp
@@ -75,5 +75,5 @@ cc_library_static {
     proprietary: true,
 
     owner: "widevine",
-    min_sdk_version: "UpsideDownCake",
+    min_sdk_version: "34",
 }
diff --git a/libwvdrmengine/mediacrypto/Android.bp b/libwvdrmengine/mediacrypto/Android.bp
index a685071d..26adf9e4 100644
--- a/libwvdrmengine/mediacrypto/Android.bp
+++ b/libwvdrmengine/mediacrypto/Android.bp
@@ -64,5 +64,5 @@ cc_library_static {
     cflags: ["-Wthread-safety"],
 
     proprietary: true,
-    min_sdk_version: "UpsideDownCake",
+    min_sdk_version: "34",
 }
diff --git a/libwvdrmengine/mediadrm/Android.bp b/libwvdrmengine/mediadrm/Android.bp
index 5841e70f..afa2c6cf 100644
--- a/libwvdrmengine/mediadrm/Android.bp
+++ b/libwvdrmengine/mediadrm/Android.bp
@@ -66,5 +66,5 @@ cc_library_static {
     ],
 
     proprietary: true,
-    min_sdk_version: "UpsideDownCake",
+    min_sdk_version: "34",
 }
diff --git a/libwvdrmengine/oemcrypto/odk/Android.bp b/libwvdrmengine/oemcrypto/odk/Android.bp
index 544c838f..cc83a757 100644
--- a/libwvdrmengine/oemcrypto/odk/Android.bp
+++ b/libwvdrmengine/oemcrypto/odk/Android.bp
@@ -38,7 +38,7 @@ cc_library_static {
     proprietary: true,
 
     owner: "widevine",
-    min_sdk_version: "UpsideDownCake",
+    min_sdk_version: "34",
 }
 
 // ----------------------------------------------------------------