From ca0a653b2dd1d00bdd1a976976fbae0119f5c0f0 Mon Sep 17 00:00:00 2001
From: Kyle Zhang <kelzhan@google.com>
Date: Tue, 31 Jan 2023 00:05:55 +0000
Subject: [PATCH] Add non-updatable Widevine Apex in build

Bug: 251299786
Test: m com.google.android.widevine.nonupdatable
Change-Id: I7129d28ef1fbfddf4176849f5d6bbe9dcc6b3df1
---
 libwvdrmengine/apex/nonupdatable/Android.bp   |  47 ++++++++++++++++++
 ...m.google.android.widevine.nonupdatable.pk8 | Bin 0 -> 2376 bytes
 ...gle.android.widevine.nonupdatable.x509.pem |  32 ++++++++++++
 libwvdrmengine/apex/nonupdatable/device.mk    |  10 ++++
 4 files changed, 89 insertions(+)
 create mode 100644 libwvdrmengine/apex/nonupdatable/Android.bp
 create mode 100644 libwvdrmengine/apex/nonupdatable/com.google.android.widevine.nonupdatable.pk8
 create mode 100644 libwvdrmengine/apex/nonupdatable/com.google.android.widevine.nonupdatable.x509.pem
 create mode 100644 libwvdrmengine/apex/nonupdatable/device.mk

diff --git a/libwvdrmengine/apex/nonupdatable/Android.bp b/libwvdrmengine/apex/nonupdatable/Android.bp
new file mode 100644
index 00000000..63195a4e
--- /dev/null
+++ b/libwvdrmengine/apex/nonupdatable/Android.bp
@@ -0,0 +1,47 @@
+// Copyright (C) 2023 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "vendor_widevine_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["vendor_widevine_license"],
+}
+
+soong_config_module_type {
+    name: "widevine_nonupdatable_cert_override",
+    module_type: "override_apex",
+    config_namespace: "widevine",
+    bool_variables: ["use_devkey"],
+    properties: ["certificate"],
+}
+
+widevine_nonupdatable_cert_override {
+    name: "com.google.android.widevine.nonupdatable",
+    base: "com.google.android.widevine",
+    package_name: "com.google.android.widevine.nonupdatable",
+    certificate: ":com.google.android.widevine.nonupdatable.certificate",
+    soong_config_variables: {
+        use_devkey: {
+            certificate: ":com_google_android_widevine_nonupdatable-container",
+        },
+    },
+}
+
+android_app_certificate {
+    name: "com.google.android.widevine.nonupdatable.certificate",
+    certificate: "com.google.android.widevine.nonupdatable",
+}
\ No newline at end of file
diff --git a/libwvdrmengine/apex/nonupdatable/com.google.android.widevine.nonupdatable.pk8 b/libwvdrmengine/apex/nonupdatable/com.google.android.widevine.nonupdatable.pk8
new file mode 100644
index 0000000000000000000000000000000000000000..2029e2cf647ec2e7213f6bdcae4f33d32ee7abe4
GIT binary patch
literal 2376
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

literal 0
HcmV?d00001

diff --git a/libwvdrmengine/apex/nonupdatable/com.google.android.widevine.nonupdatable.x509.pem b/libwvdrmengine/apex/nonupdatable/com.google.android.widevine.nonupdatable.x509.pem
new file mode 100644
index 00000000..cd96726c
--- /dev/null
+++ b/libwvdrmengine/apex/nonupdatable/com.google.android.widevine.nonupdatable.x509.pem
@@ -0,0 +1,32 @@
+-----BEGIN CERTIFICATE-----
+MIIFbTCCA1WgAwIBAgIUCt0Lcn+Z6NC4i3mu49uFE5ZMDtEwDQYJKoZIhvcNAQEL
+BQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
+GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAgFw0yMzAxMzEwMjA1MzFaGA80NzYw
+MTIyNzAyMDUzMVowRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUx
+ITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDCCAiIwDQYJKoZIhvcN
+AQEBBQADggIPADCCAgoCggIBAJ+9tUEe/zWrsnODHKchUiOtkLhLL2izvz29hu46
+7oAyGhhpB6BRBaOBU66+b7P8yhth76uiAVKld3byxohLFTjFhdZHwBiFMSOnflJy
+71XS+uvjs7CEKNPBFouv6gtGcpDosSVAnYBEfbgWBeLKl1UKq79EOyWzNUp5+tfn
+fITxuzjdTQy8y6APVfxj2YNvQ5sDWLj1M1Gx+fSdX4UszP6j0HToEIlzgFzwrwLW
+u2YqjdEBGlj6kT+SbO6jTzx8aHMxq7iMMZna7unzb1Sa+VJv2Kg4GWHHFbTg431T
+XcWYV13+tG94WbHHcvUI3KZap1oRX7bEQYJhnwaxL1rHwBQnk16d9tHYMjhQKkkS
+TGJU01sfyOnwC07Kp/kFcXF5fuUGmxvqDd3gsTq80Bm1rTo2MMIII3Gh4nwF3rrR
+T7ZbNGIjxnhqFtmCsXUB7WoUdSAn3IsqSKabXij22zFuBSa1AOSBiXcYTOpjxaCR
+ihenO6UdgnVLgVpBpP5IMFyZ35EDEB0C1IeRlYGtteuiVk/8IiV9R//MObN9tZbw
+0UftMYdtZUUNLpwx2tIJeAwkBsh2S2CQzDvdWhRz1AETCqdu9HJP7RDOu3UoJ0t8
+MJryOzrC4YaOW7mcNFfBj7AiBW0DKJd9yhc+KawWlRuLduSXAB0R/OQU8rKqnDDA
+LvlPAgMBAAGjUzBRMB0GA1UdDgQWBBRcyifNYScCJxFLTJx3R//ITVPUVjAfBgNV
+HSMEGDAWgBRcyifNYScCJxFLTJx3R//ITVPUVjAPBgNVHRMBAf8EBTADAQH/MA0G
+CSqGSIb3DQEBCwUAA4ICAQCU6I5RaBFpiDcQzoYl0sI9h/8C01HdNwSfPmJzLw9P
+ICRie/j6ZRH+tKwpEE8jloXod2/YlJbQ4e8Ogl5CfJVo5eqKgNu7mYExrzLg434N
+7G7Xv+DqhyMoLhFwpZqdw02iSBQ+Sp6O7FC7qYEz8XpzP6Hp4f0wsrAUImSCHODd
+K8NhQtIHwNiIucKalkKGlBrxIa9Ue3YZqXJvMsKTs8BiAIyxRbs+pLsp7z0E/7J5
+LoxgiJ6HVRLx6qTSTiZQhbdmO/Rv/qGkeQxOXWWK+O893W6XebRFp5c4XaaKWFsI
+T411Odn8FgCrhCXiiD7dX5usVmEzdyqBBOVv5eKveWY0cHALMo5e72wJcXwdD6qc
+aLwRCV4HwLll40U8E3jMfb2ZB25knzCPekTQuMyF9JH6dZPVkgxvNTPFB0rkH1NM
+Ja4nm9gYa8GqbHKDgpO4zU9UfPAdtrRkLl/UrAJLzfkw2NxlXeTWPKKVo/pidImb
+LGlCqm0vP5NYMDJSyKxdru5iq/wsrj0YC7RqXmBPDexSo6MvQHLV6GgP7HiP/9p4
+egBIJ70YlmWdlCmdqPFjFpV792HT4W6Qj5nrnaHoFdwitG+vbnUaaX+Q9PpdSvbA
+lO1g0EU1oQIar09sog5fQcLWXQRpUEb42WeD/qkZ5V8j11moVT+ToBaCV/9P9jF4
+Yw==
+-----END CERTIFICATE-----
diff --git a/libwvdrmengine/apex/nonupdatable/device.mk b/libwvdrmengine/apex/nonupdatable/device.mk
new file mode 100644
index 00000000..018fa836
--- /dev/null
+++ b/libwvdrmengine/apex/nonupdatable/device.mk
@@ -0,0 +1,10 @@
+PRODUCT_PACKAGES += \
+	com.google.android.widevine.nonupdatable \
+
+# Check if we can use dev keys
+ifneq ($(wildcard vendor/google/dev-keystore),)
+$(call soong_config_set,widevine,use_devkey,true)
+endif
+
+PRODUCT_VENDOR_LINKER_CONFIG_FRAGMENTS += \
+	vendor/widevine/libwvdrmengine/apex/device/linker.config.json
\ No newline at end of file