Merge "Drop Widevine Apex release key signed prebuilts" into udc-dev

.prebuilt_info/apex/prebuilt_info_libwvdrmengine_apex_prebuilt_com_google_android_widevine_apks.asciipb

@@ -0,0 +1,15 @@
+drops {
+  android_build_drop {
+    build_id: "9842411"
+    target: "mainline_modules-user"
+    source_file: "release_keys_signed_apks/com.google.android.widevine.apks"
+  }
+  dest_file: "libwvdrmengine/apex/prebuilt/com.google.android.widevine.apks"
+  version: ""
+  version_group: "apex"
+  git_project: "platform/vendor/widevine"
+  git_branch: "udc-dev"
+  transform: TRANSFORM_NONE
+  transform_options {
+  }
+}

.prebuilt_info/apex/prebuilt_info_libwvdrmengine_apex_prebuilt_com_google_android_widevine_lazy_apks.asciipb

@@ -0,0 +1,15 @@
+drops {
+  android_build_drop {
+    build_id: "9842411"
+    target: "mainline_modules-user"
+    source_file: "release_keys_signed_apks/com.google.android.widevine.lazy.apks"
+  }
+  dest_file: "libwvdrmengine/apex/prebuilt/com.google.android.widevine.lazy.apks"
+  version: ""
+  version_group: "apex"
+  git_project: "platform/vendor/widevine"
+  git_branch: "udc-dev"
+  transform: TRANSFORM_NONE
+  transform_options {
+  }
+}

.prebuilt_info/apex/prebuilt_info_libwvdrmengine_apex_prebuilt_com_google_android_widevine_nonupdatable_apks.asciipb

@@ -0,0 +1,15 @@
+drops {
+  android_build_drop {
+    build_id: "9842411"
+    target: "mainline_modules-user"
+    source_file: "release_keys_signed_apks/com.google.android.widevine.nonupdatable.apks"
+  }
+  dest_file: "libwvdrmengine/apex/prebuilt/com.google.android.widevine.nonupdatable.apks"
+  version: ""
+  version_group: "apex"
+  git_project: "platform/vendor/widevine"
+  git_branch: "udc-dev"
+  transform: TRANSFORM_NONE
+  transform_options {
+  }
+}

libwvdrmengine/apex/prebuilt/Android.bp

@@ -46,3 +46,40 @@ module_apex_set {
         },
     },
 }
+
+module_apex_set {
+    name: "com.google.android.widevine.lazy",
+    apex_name: "com.google.android.widevine.lazy",
+    owner: "google",
+    set: "com.google.android.widevine.lazy.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,
+        },
+    },
+}
+
+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,
+        },
+    },
+}
+