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

Revert "Use aidl interface for Widevine service."

Browse Source 
This reverts commit 96a8ccd4a1.

Reason for revert:
Could break DeviceManifest/SingleManifestTest#ManifestAidlHalsServed

Bug: 200055138
Bug: 170964303
Bug: 217241995
Change-Id: I9c42df15defec428c9ef8c62439c63d4a603fee6
This commit is contained in:
Yohei Yukawa
2022-01-31 22:01:25 +00:00
parent 96a8ccd4a1
commit a4d835af3a
75 changed files with 1480 additions and 7078 deletions
Download Patch File Download Diff File Expand all files Collapse all files

155
libwvdrmengine/Android.bp
View File

@@ -114,29 +114,6 @@ cc_defaults {
],
}
cc_defaults {
name: "common_widevine_service-multilib-defaults-aidl",
owner: "widevine",
proprietary: true,
relative_install_path: "hw",
include_dirs: [
"vendor/widevine/libwvdrmengine/aidl_include",
"vendor/widevine/libwvdrmengine/mediadrm/aidl_include",
"vendor/widevine/libwvdrmengine/oemcrypto/include",
],
header_libs: ["libstagefright_foundation_headers"],
shared_libs: [
"android.hardware.drm-V1-ndk",
"libbase",
"libbinder_ndk",
"liblog",
"libhwbinder",
"libutils",
"libwvaidl",
],
}
cc_defaults {
name: "common_widevine_service-multilib-defaults",
defaults: [
@@ -250,26 +227,7 @@ cc_binary {
}
// ----------------------------------------------------------------------------
// Builds android.hardware.drm-service.widevine
//
cc_binary {
name: "android.hardware.drm-service.widevine",
defaults: [
"common_widevine_service-multilib-first",
"common_widevine_service-multilib-defaults-aidl",
],
srcs: ["aidl_src/service.cpp"],
shared_libs: ["libbinder"],
init_rc: ["aidl_src/android.hardware.drm-service.widevine.rc"],
vintf_fragments: ["manifest_android.hardware.drm-service.widevine.xml"],
}
// ----------------------------------------------------------------------------
// Builds libcdm_utils.a and libcdm_utils_hidl.a
// Builds libcdm_utils.a
//
cdm_util_src_files = [
@@ -286,40 +244,6 @@ cdm_util_src_files = [
"cdm/util/src/string_conversions.cpp",
]
cc_library_static {
name: "libcdm_utils_hidl",
proprietary: true,
include_dirs: [
"vendor/widevine/libwvdrmengine/cdm/core/include",
"vendor/widevine/libwvdrmengine/cdm/include",
"vendor/widevine/libwvdrmengine/cdm/util/include",
"vendor/widevine/libwvdrmengine/oemcrypto/include",
],
header_libs: [
"libbase_headers",
"libutils_headers",
],
shared_libs: [
"libbinder",
"libcrypto",
"libhidlbase",
"liblog",
],
cflags: [
"-DCORE_UTIL_IMPLEMENTATION",
"-DIS_HIDL",
],
srcs: cdm_util_src_files,
}
cc_library_static {
name: "libcdm_utils",
@@ -339,10 +263,9 @@ cc_library_static {
],
shared_libs: [
"libbinder",
"liblog",
"libcrypto",
"libhidlbase",
"liblog",
],
cflags: ["-DCORE_UTIL_IMPLEMENTATION"],
@@ -374,7 +297,7 @@ cc_library_shared {
"vendor/widevine/libwvdrmengine/cdm/util/include",
"vendor/widevine/libwvdrmengine/cdm/include",
"vendor/widevine/libwvdrmengine/include",
"vendor/widevine/libwvdrmengine/include_hidl",
"vendor/widevine/libwvdrmengine/include_hidl",
"vendor/widevine/libwvdrmengine/mediacrypto/include_hidl",
"vendor/widevine/libwvdrmengine/mediadrm/include_hidl",
"vendor/widevine/libwvdrmengine/oemcrypto/include",
@@ -383,7 +306,7 @@ cc_library_shared {
static_libs: [
"libcdm",
"libcdm_protos",
"libcdm_utils_hidl",
"libcdm_utils",
"libjsmn",
"libwvdrmcryptoplugin_hidl",
"libwvdrmdrmplugin_hidl",
@@ -456,73 +379,3 @@ cc_prebuilt_library_shared {
proprietary: true,
}
// ----------------------------------------------------------------------------
// Builds libwvaidl.so
//
cc_library_shared {
name: "libwvaidl",
srcs: [
"src/WVCDMSingleton.cpp",
"src/WVUUID.cpp",
"aidl_src/wv_metrics.cpp",
"aidl_src/WVCreatePluginFactories.cpp",
"aidl_src/WVCryptoFactory.cpp",
"aidl_src/WVDrmFactory.cpp",
],
include_dirs: [
"frameworks/av/include",
"frameworks/native/include",
"vendor/widevine/libwvdrmengine/cdm/core/include",
"vendor/widevine/libwvdrmengine/cdm/metrics/include",
"vendor/widevine/libwvdrmengine/cdm/util/include",
"vendor/widevine/libwvdrmengine/cdm/include",
"vendor/widevine/libwvdrmengine/aidl_include",
"vendor/widevine/libwvdrmengine/include",
"vendor/widevine/libwvdrmengine/mediacrypto/aidl_include",
"vendor/widevine/libwvdrmengine/mediadrm/aidl_include",
"vendor/widevine/libwvdrmengine/oemcrypto/include",
],
static_libs: [
"android.hardware.common-V2-ndk",
"libaidlcommonsupport",
"libcdm",
"libcdm_protos",
"libcdm_utils",
"libjsmn",
"libwvdrmcryptoplugin_aidl",
"libwvdrmdrmplugin_aidl",
"libwvlevel3",
"libwv_odk",
],
shared_libs: [
"android.hardware.drm-V1-ndk",
"libbase",
"libbinder",
"libbinder_ndk",
"libcrypto",
"libcutils",
"libdl",
"liblog",
"libprotobuf-cpp-lite",
"libutils",
],
header_libs: ["libstagefright_foundation_headers"],
owner: "widevine",
proprietary: true,
}
phony {
name: "android.hardware.drm@latest-service.widevine",
required: [
"android.hardware.drm-service.widevine",
],
}