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

Rename aidl_ include and src directories.

Browse Source 
[ Merged from http://go/wvgerrit/152549 ]

Test: unit tests
Test: Google TV and Netflix
Test: atest GtsMediaTestCases

Bug: 216527109
Change-Id: Id70e43315550508e6fedacfee4f4ec009a24d0e3
This commit is contained in:
Edwin Wong
2022-05-24 17:37:06 +00:00
parent a7b76187ea
commit 5400741601
29 changed files with 59 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
libwvdrmengine/Android.bp
View File

@@ -120,8 +120,8 @@ cc_defaults {
proprietary: true,
relative_install_path: "hw",
include_dirs: [
"vendor/widevine/libwvdrmengine/aidl_include",
"vendor/widevine/libwvdrmengine/mediadrm/aidl_include",
"vendor/widevine/libwvdrmengine/include",
"vendor/widevine/libwvdrmengine/mediadrm/include",
"vendor/widevine/libwvdrmengine/oemcrypto/include",
],
header_libs: ["libstagefright_foundation_headers"],
@@ -258,7 +258,7 @@ cc_binary {
"common_widevine_service-multilib-defaults-aidl",
],
srcs: ["aidl_src/service.cpp"],
srcs: ["src/service.cpp"],
include_dirs: [
"frameworks/native/libs/binder/include",
@@ -266,7 +266,7 @@ cc_binary {
shared_libs: ["libbinder_ndk"],
init_rc: ["aidl_src/android.hardware.drm-service.widevine.rc"],
init_rc: ["src/android.hardware.drm-service.widevine.rc"],
vintf_fragments: ["manifest_android.hardware.drm-service.widevine.xml"],
}
@@ -281,7 +281,7 @@ cc_binary {
"common_widevine_service-multilib-defaults-aidl",
],
srcs: ["aidl_src/serviceLazy.cpp"],
srcs: ["src/serviceLazy.cpp"],
include_dirs: [
"frameworks/native/libs/binder/include",
@@ -289,7 +289,7 @@ cc_binary {
shared_libs: ["libbinder_ndk"],
init_rc: ["aidl_src/android.hardware.drm-service-lazy.widevine.rc"],
init_rc: ["src/android.hardware.drm-service-lazy.widevine.rc"],
vintf_fragments: ["manifest_android.hardware.drm-service.widevine.xml"],
}
@@ -489,9 +489,9 @@ cc_library_shared {
srcs: [
"src/WVCDMSingleton.cpp",
"src/WVUUID.cpp",
"aidl_src/wv_metrics.cpp",
"aidl_src/WVCreatePluginFactories.cpp",
"aidl_src/WVDrmFactory.cpp",
"src/wv_metrics.cpp",
"src/WVCreatePluginFactories.cpp",
"src/WVDrmFactory.cpp",
],
include_dirs: [
@@ -501,10 +501,9 @@ cc_library_shared {
"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/mediacrypto/include",
"vendor/widevine/libwvdrmengine/mediadrm/include",
"vendor/widevine/libwvdrmengine/oemcrypto/include",
],
@@ -561,9 +560,9 @@ cc_library_shared {
srcs: [
"src/WVCDMSingleton.cpp",
"src/WVUUID.cpp",
"aidl_src/wv_metrics.cpp",
"aidl_src/WVCreatePluginFactories.cpp",
"aidl_src/WVDrmFactory.cpp",
"src/wv_metrics.cpp",
"src/WVCreatePluginFactories.cpp",
"src/WVDrmFactory.cpp",
],
include_dirs: [
@@ -573,10 +572,9 @@ cc_library_shared {
"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/mediacrypto/include",
"vendor/widevine/libwvdrmengine/mediadrm/include",
"vendor/widevine/libwvdrmengine/oemcrypto/include",
],
@@ -618,8 +616,8 @@ cc_defaults {
proprietary: true,
relative_install_path: "hw",
include_dirs: [
"vendor/widevine/libwvdrmengine/aidl_include",
"vendor/widevine/libwvdrmengine/mediadrm/aidl_include",
"vendor/widevine/libwvdrmengine/include",
"vendor/widevine/libwvdrmengine/mediadrm/include",
"vendor/widevine/libwvdrmengine/oemcrypto/include",
],
header_libs: ["libstagefright_foundation_headers"],
@@ -641,7 +639,30 @@ cc_fuzz {
"common_widevine_service-multilib-defaults-aidl_fuzz",
"service_fuzzer_defaults",
],
srcs: ["aidl_src/fuzzer/fuzzer.cpp"],
static_libs: [
"libbase",
"libbinder_random_parcel",
"libcutils",
"libutils",
],
target: {
android: {
shared_libs: [
"libbinder_ndk",
"libbinder",
],
},
host: {
static_libs: [
"libbinder_ndk",
"libbinder",
],
},
darwin: {
enabled: false,
},
},
srcs: ["src/fuzzer/fuzzer.cpp"],
fuzz_config: {
cc: [
"edwinwong@google.com",