From fdc585a55de2341bd5339658804b4ab81daa572c Mon Sep 17 00:00:00 2001 From: Kyle Zhang Date: Tue, 1 Feb 2022 18:08:38 +0000 Subject: [PATCH] Fix files mis-synced from cdm repo to Android Test: build Bug: 161477208 Change-Id: I2d48dff987fe37a54ffdfc47a7896fba975a0e20 --- libwvdrmengine/Android.bp | 7 +++++++ libwvdrmengine/mediacrypto/Android.bp | 10 ++++++++++ libwvdrmengine/mediadrm/Android.bp | 9 +++++++++ 3 files changed, 26 insertions(+) diff --git a/libwvdrmengine/Android.bp b/libwvdrmengine/Android.bp index 46d6e5d8..4435855b 100644 --- a/libwvdrmengine/Android.bp +++ b/libwvdrmengine/Android.bp @@ -379,3 +379,10 @@ cc_prebuilt_library_shared { proprietary: true, } + +phony { + name: "android.hardware.drm@latest-service.widevine", + required: [ + "android.hardware.drm@1.4-service.widevine", + ], +} \ No newline at end of file diff --git a/libwvdrmengine/mediacrypto/Android.bp b/libwvdrmengine/mediacrypto/Android.bp index 7242e3b4..5f840200 100644 --- a/libwvdrmengine/mediacrypto/Android.bp +++ b/libwvdrmengine/mediacrypto/Android.bp @@ -11,7 +11,17 @@ // 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. + // ----------------------------------------------------------------------------- +// *** THIS PACKAGE HAS SPECIAL LICENSING CONDITIONS. PLEASE +// CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE +// DEPENDING ON IT IN YOUR PROJECT. *** +package { + // See: http://go/android-license-faq + // legacy_by_exception_only (by exception only) + default_applicable_licenses: ["vendor_widevine_license"], +} + // Builds libwvdrmcryptoplugin_hidl // cc_library_static { diff --git a/libwvdrmengine/mediadrm/Android.bp b/libwvdrmengine/mediadrm/Android.bp index b45258da..ef3ee364 100644 --- a/libwvdrmengine/mediadrm/Android.bp +++ b/libwvdrmengine/mediadrm/Android.bp @@ -13,6 +13,15 @@ // limitations under the License. // ---------------------------------------------------------------------------- +// *** THIS PACKAGE HAS SPECIAL LICENSING CONDITIONS. PLEASE +// CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE +// DEPENDING ON IT IN YOUR PROJECT. *** +package { + // See: http://go/android-license-faq + // legacy_by_exception_only (by exception only) + default_applicable_licenses: ["vendor_widevine_license"], +} + // Builds libwvdrmdrmplugin_hidl // cc_library_static {