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

Revert "Rename aidl_ include and src directories."

Browse Source 
This reverts commit 5400741601.

Reason for revert: broke hidl build

Change-Id: I3954a1c0d6c0d7a663bd2a1c8c8888cae37cee80
This commit is contained in:
Edwin Wong
2022-09-02 17:17:20 +00:00
parent 5400741601
commit a7aa1c5013
29 changed files with 45 additions and 59 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/include",
"vendor/widevine/libwvdrmengine/mediadrm/include",
"vendor/widevine/libwvdrmengine/aidl_include",
"vendor/widevine/libwvdrmengine/mediadrm/aidl_include",
"vendor/widevine/libwvdrmengine/oemcrypto/include",
],
header_libs: ["libstagefright_foundation_headers"],
@@ -258,7 +258,7 @@ cc_binary {
"common_widevine_service-multilib-defaults-aidl",
],
srcs: ["src/service.cpp"],
srcs: ["aidl_src/service.cpp"],
include_dirs: [
"frameworks/native/libs/binder/include",
@@ -266,7 +266,7 @@ cc_binary {
shared_libs: ["libbinder_ndk"],
init_rc: ["src/android.hardware.drm-service.widevine.rc"],
init_rc: ["aidl_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: ["src/serviceLazy.cpp"],
srcs: ["aidl_src/serviceLazy.cpp"],
include_dirs: [
"frameworks/native/libs/binder/include",
@@ -289,7 +289,7 @@ cc_binary {
shared_libs: ["libbinder_ndk"],
init_rc: ["src/android.hardware.drm-service-lazy.widevine.rc"],
init_rc: ["aidl_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",
"src/wv_metrics.cpp",
"src/WVCreatePluginFactories.cpp",
"src/WVDrmFactory.cpp",
"aidl_src/wv_metrics.cpp",
"aidl_src/WVCreatePluginFactories.cpp",
"aidl_src/WVDrmFactory.cpp",
],
include_dirs: [
@@ -501,9 +501,10 @@ 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/include",
"vendor/widevine/libwvdrmengine/mediadrm/include",
"vendor/widevine/libwvdrmengine/mediacrypto/aidl_include",
"vendor/widevine/libwvdrmengine/mediadrm/aidl_include",
"vendor/widevine/libwvdrmengine/oemcrypto/include",
],
@@ -560,9 +561,9 @@ cc_library_shared {
srcs: [
"src/WVCDMSingleton.cpp",
"src/WVUUID.cpp",
"src/wv_metrics.cpp",
"src/WVCreatePluginFactories.cpp",
"src/WVDrmFactory.cpp",
"aidl_src/wv_metrics.cpp",
"aidl_src/WVCreatePluginFactories.cpp",
"aidl_src/WVDrmFactory.cpp",
],
include_dirs: [
@@ -572,9 +573,10 @@ 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/include",
"vendor/widevine/libwvdrmengine/mediadrm/include",
"vendor/widevine/libwvdrmengine/mediacrypto/aidl_include",
"vendor/widevine/libwvdrmengine/mediadrm/aidl_include",
"vendor/widevine/libwvdrmengine/oemcrypto/include",
],
@@ -616,8 +618,8 @@ cc_defaults {
proprietary: true,
relative_install_path: "hw",
include_dirs: [
"vendor/widevine/libwvdrmengine/include",
"vendor/widevine/libwvdrmengine/mediadrm/include",
"vendor/widevine/libwvdrmengine/aidl_include",
"vendor/widevine/libwvdrmengine/mediadrm/aidl_include",
"vendor/widevine/libwvdrmengine/oemcrypto/include",
],
header_libs: ["libstagefright_foundation_headers"],
@@ -639,30 +641,7 @@ cc_fuzz {
"common_widevine_service-multilib-defaults-aidl_fuzz",
"service_fuzzer_defaults",
],
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"],
srcs: ["aidl_src/fuzzer/fuzzer.cpp"],
fuzz_config: {
cc: [
"edwinwong@google.com",