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

10
libwvdrmengine/mediacrypto/Android.bp
View File

@@ -71,7 +71,7 @@ cc_library_static {
cc_library_static {
name: "libwvdrmcryptoplugin_aidl",
srcs: ["src/WVCryptoPlugin.cpp"],
srcs: ["aidl_src/WVCryptoPlugin.cpp"],
include_dirs: [
"frameworks/av/include",
@@ -80,8 +80,9 @@ cc_library_static {
"vendor/widevine/libwvdrmengine/cdm/include",
"vendor/widevine/libwvdrmengine/cdm/metrics/include",
"vendor/widevine/libwvdrmengine/cdm/util/include",
"vendor/widevine/libwvdrmengine/aidl_include",
"vendor/widevine/libwvdrmengine/include",
"vendor/widevine/libwvdrmengine/mediacrypto/include",
"vendor/widevine/libwvdrmengine/mediacrypto/aidl_include",
"vendor/widevine/libwvdrmengine/oemcrypto/include",
],
@@ -114,7 +115,7 @@ cc_library_static {
cc_library_static {
name: "libwvdrmcryptoplugin_aidl_fuzz",
srcs: ["src/WVCryptoPlugin.cpp"],
srcs: ["aidl_src/WVCryptoPlugin.cpp"],
include_dirs: [
"frameworks/av/include",
@@ -123,8 +124,9 @@ cc_library_static {
"vendor/widevine/libwvdrmengine/cdm/include",
"vendor/widevine/libwvdrmengine/cdm/metrics/include",
"vendor/widevine/libwvdrmengine/cdm/util/include",
"vendor/widevine/libwvdrmengine/aidl_include",
"vendor/widevine/libwvdrmengine/include",
"vendor/widevine/libwvdrmengine/mediacrypto/include",
"vendor/widevine/libwvdrmengine/mediacrypto/aidl_include",
"vendor/widevine/libwvdrmengine/oemcrypto/include",
],

0
libwvdrmengine/mediacrypto/include/WVCryptoPlugin.h → libwvdrmengine/mediacrypto/aidl_include/WVCryptoPlugin.h
View File

0
libwvdrmengine/mediacrypto/src/WVCryptoPlugin.cpp → libwvdrmengine/mediacrypto/aidl_src/WVCryptoPlugin.cpp
View File

4
libwvdrmengine/mediacrypto/test/Android.mk
View File

@@ -64,8 +64,8 @@ LOCAL_C_INCLUDES := \
vendor/widevine/libwvdrmengine/cdm/include \
vendor/widevine/libwvdrmengine/cdm/metrics/include \
vendor/widevine/libwvdrmengine/cdm/util/include \
vendor/widevine/libwvdrmengine/include \
vendor/widevine/libwvdrmengine/mediacrypto/include \
vendor/widevine/libwvdrmengine/aidl_include \
vendor/widevine/libwvdrmengine/mediacrypto/aidl_include \
vendor/widevine/libwvdrmengine/oemcrypto/include \
LOCAL_STATIC_LIBRARIES := \