widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Convert libwvdrmengine to soong."

Browse Source 
This change introduced b/38487636 "Distorted video observed when
playing purchased/rented movie in Google play movies & TV app."

Before resubmitting an updated variant of the original CL, please
test playback with Play Movies and the GTS media tests. 

This reverts commit 33f9979b2b.

Change-Id: I4ec2e6fe81323e91e4b62288755c967999e81041
This commit is contained in:
Jeff Tinker
2017-05-24 21:16:53 +00:00
parent 33f9979b2b
commit 23398a8d7c
28 changed files with 850 additions and 742 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
libwvdrmengine/mediadrm/Android.bp
View File

@@ -1,60 +0,0 @@
//
// Copyright (C) 2017 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.
//
cc_library_static {
name: "libwvdrmdrmplugin",
srcs: [
"src/WVDrmPlugin.cpp",
"src/WVGenericCryptoInterface.cpp",
],
include_dirs: [
"vendor/widevine/libwvdrmengine/include",
],
export_include_dirs: ["include"],
static_libs: [
"libcdm",
"libcrypto_static",
],
header_libs: [
"liboemcrypto_libwvdrmengine_local",
],
}
cc_library_static {
name: "libwvdrmdrmplugin_hidl",
srcs: [
"src_hidl/WVDrmPlugin.cpp",
"src_hidl/WVGenericCryptoInterface.cpp",
],
include_dirs: [
"vendor/widevine/libwvdrmengine/include_hidl",
],
export_include_dirs: ["include_hidl"],
static_libs: [
"libcdm",
"libcrypto_static",
],
header_libs: [
"liboemcrypto_libwvdrmengine_local",
],
shared_libs: [
"android.hardware.drm@1.0",
"android.hidl.memory@1.0",
"libwvdrmengine",
],
}
subdirs = ["test"]