diff --git a/libwvdrmengine/Android.bp b/libwvdrmengine/Android.bp index ac7ec751..865b57be 100644 --- a/libwvdrmengine/Android.bp +++ b/libwvdrmengine/Android.bp @@ -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", diff --git a/libwvdrmengine/cdm/core/include/wv_cdm_types.h b/libwvdrmengine/cdm/core/include/wv_cdm_types.h index 7ee68be8..fa9e15a7 100644 --- a/libwvdrmengine/cdm/core/include/wv_cdm_types.h +++ b/libwvdrmengine/cdm/core/include/wv_cdm_types.h @@ -445,7 +445,7 @@ enum CdmResponseType : int32_t { // Don't forget to add new values to // * core/test/test_printers.cpp. // * android/include/mapErrors-inl.h - // * android/include_hidl/mapErrors-inl.h + // * android/include_hidl/HidlMapErrors-inl.h }; enum CdmKeyStatus : int32_t { diff --git a/libwvdrmengine/aidl_include/Utils.h b/libwvdrmengine/include/Utils.h similarity index 100% rename from libwvdrmengine/aidl_include/Utils.h rename to libwvdrmengine/include/Utils.h diff --git a/libwvdrmengine/aidl_include/WVCreatePluginFactories.h b/libwvdrmengine/include/WVCreatePluginFactories.h similarity index 100% rename from libwvdrmengine/aidl_include/WVCreatePluginFactories.h rename to libwvdrmengine/include/WVCreatePluginFactories.h diff --git a/libwvdrmengine/aidl_include/WVDrmFactory.h b/libwvdrmengine/include/WVDrmFactory.h similarity index 100% rename from libwvdrmengine/aidl_include/WVDrmFactory.h rename to libwvdrmengine/include/WVDrmFactory.h diff --git a/libwvdrmengine/aidl_include/WVTypes.h b/libwvdrmengine/include/WVTypes.h similarity index 100% rename from libwvdrmengine/aidl_include/WVTypes.h rename to libwvdrmengine/include/WVTypes.h diff --git a/libwvdrmengine/aidl_include/mapErrors-inl.h b/libwvdrmengine/include/mapErrors-inl.h similarity index 100% rename from libwvdrmengine/aidl_include/mapErrors-inl.h rename to libwvdrmengine/include/mapErrors-inl.h diff --git a/libwvdrmengine/aidl_include/wv_metrics.h b/libwvdrmengine/include/wv_metrics.h similarity index 100% rename from libwvdrmengine/aidl_include/wv_metrics.h rename to libwvdrmengine/include/wv_metrics.h diff --git a/libwvdrmengine/include_hidl/mapErrors-inl.h b/libwvdrmengine/include_hidl/HidlMapErrors-inl.h similarity index 100% rename from libwvdrmengine/include_hidl/mapErrors-inl.h rename to libwvdrmengine/include_hidl/HidlMapErrors-inl.h diff --git a/libwvdrmengine/include_hidl/WVCreatePluginFactories.h b/libwvdrmengine/include_hidl/HidlWVCreatePluginFactories.h similarity index 100% rename from libwvdrmengine/include_hidl/WVCreatePluginFactories.h rename to libwvdrmengine/include_hidl/HidlWVCreatePluginFactories.h diff --git a/libwvdrmengine/include_hidl/WVDrmFactory.h b/libwvdrmengine/include_hidl/HidlWVDrmFactory.h similarity index 98% rename from libwvdrmengine/include_hidl/WVDrmFactory.h rename to libwvdrmengine/include_hidl/HidlWVDrmFactory.h index db142db7..88e542d8 100644 --- a/libwvdrmengine/include_hidl/WVDrmFactory.h +++ b/libwvdrmengine/include_hidl/HidlWVDrmFactory.h @@ -8,8 +8,8 @@ #define WV_DRM_FACTORY_H_ #include "HidlTypes.h" +#include "HidlWVTypes.h" #include "WVGenericCryptoInterface.h" -#include "WVTypes.h" namespace wvdrm { namespace hardware { diff --git a/libwvdrmengine/include_hidl/WVTypes.h b/libwvdrmengine/include_hidl/HidlWVTypes.h similarity index 100% rename from libwvdrmengine/include_hidl/WVTypes.h rename to libwvdrmengine/include_hidl/HidlWVTypes.h diff --git a/libwvdrmengine/include_hidl/WVCryptoFactory.h b/libwvdrmengine/include_hidl/WVCryptoFactory.h index fe2f279d..7a9f925c 100644 --- a/libwvdrmengine/include_hidl/WVCryptoFactory.h +++ b/libwvdrmengine/include_hidl/WVCryptoFactory.h @@ -8,7 +8,7 @@ #define WV_CRYPTO_FACTORY_H_ #include "HidlTypes.h" -#include "WVTypes.h" +#include "HidlWVTypes.h" namespace wvdrm { namespace hardware { diff --git a/libwvdrmengine/include_hidl/wv_metrics.h b/libwvdrmengine/include_hidl/wv_metrics.h deleted file mode 100644 index 7cdb6a17..00000000 --- a/libwvdrmengine/include_hidl/wv_metrics.h +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright 2020 Google LLC. All Rights Reserved. This file and proprietary -// source code may only be used and distributed under the Widevine License -// Agreement. -// -// Format widevine protobuf metrics - -#include - -#include "wv_metrics.pb.h" - -namespace wv_metrics { -void FormatWvCdmMetrics(const drm_metrics::WvCdmMetrics& metrics, - std::string& result); -} diff --git a/libwvdrmengine/mediacrypto/Android.bp b/libwvdrmengine/mediacrypto/Android.bp index 0255cebf..3c288463 100644 --- a/libwvdrmengine/mediacrypto/Android.bp +++ b/libwvdrmengine/mediacrypto/Android.bp @@ -71,7 +71,7 @@ cc_library_static { cc_library_static { name: "libwvdrmcryptoplugin_aidl", - srcs: ["aidl_src/WVCryptoPlugin.cpp"], + srcs: ["src/WVCryptoPlugin.cpp"], include_dirs: [ "frameworks/av/include", @@ -80,9 +80,8 @@ 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/aidl_include", + "vendor/widevine/libwvdrmengine/mediacrypto/include", "vendor/widevine/libwvdrmengine/oemcrypto/include", ], @@ -115,7 +114,7 @@ cc_library_static { cc_library_static { name: "libwvdrmcryptoplugin_aidl_fuzz", - srcs: ["aidl_src/WVCryptoPlugin.cpp"], + srcs: ["src/WVCryptoPlugin.cpp"], include_dirs: [ "frameworks/av/include", @@ -124,9 +123,8 @@ 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/aidl_include", + "vendor/widevine/libwvdrmengine/mediacrypto/include", "vendor/widevine/libwvdrmengine/oemcrypto/include", ], diff --git a/libwvdrmengine/mediacrypto/aidl_include/WVCryptoPlugin.h b/libwvdrmengine/mediacrypto/include/WVCryptoPlugin.h similarity index 100% rename from libwvdrmengine/mediacrypto/aidl_include/WVCryptoPlugin.h rename to libwvdrmengine/mediacrypto/include/WVCryptoPlugin.h diff --git a/libwvdrmengine/mediacrypto/include_hidl/WVCryptoPlugin.h b/libwvdrmengine/mediacrypto/include_hidl/WVCryptoPlugin.h index 56d9beab..5428d2e3 100644 --- a/libwvdrmengine/mediacrypto/include_hidl/WVCryptoPlugin.h +++ b/libwvdrmengine/mediacrypto/include_hidl/WVCryptoPlugin.h @@ -13,9 +13,9 @@ #include #include "HidlTypes.h" +#include "HidlWVTypes.h" #include "log.h" #include "wv_content_decryption_module.h" -#include "WVTypes.h" namespace wvdrm { namespace hardware { diff --git a/libwvdrmengine/mediacrypto/aidl_src/WVCryptoPlugin.cpp b/libwvdrmengine/mediacrypto/src/WVCryptoPlugin.cpp similarity index 100% rename from libwvdrmengine/mediacrypto/aidl_src/WVCryptoPlugin.cpp rename to libwvdrmengine/mediacrypto/src/WVCryptoPlugin.cpp diff --git a/libwvdrmengine/mediacrypto/src_hidl/WVCryptoPlugin.cpp b/libwvdrmengine/mediacrypto/src_hidl/WVCryptoPlugin.cpp index 78a62dac..31e2b532 100644 --- a/libwvdrmengine/mediacrypto/src_hidl/WVCryptoPlugin.cpp +++ b/libwvdrmengine/mediacrypto/src_hidl/WVCryptoPlugin.cpp @@ -14,9 +14,9 @@ #include #include +#include "HidlMapErrors-inl.h" #include "HidlTypes.h" #include "log.h" -#include "mapErrors-inl.h" #include "OEMCryptoCENC.h" #include "openssl/sha.h" #include "TypeConvert.h" diff --git a/libwvdrmengine/mediacrypto/test/Android.mk b/libwvdrmengine/mediacrypto/test/Android.mk index 5baaf873..fab60ef8 100644 --- a/libwvdrmengine/mediacrypto/test/Android.mk +++ b/libwvdrmengine/mediacrypto/test/Android.mk @@ -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/aidl_include \ - vendor/widevine/libwvdrmengine/mediacrypto/aidl_include \ + vendor/widevine/libwvdrmengine/include \ + vendor/widevine/libwvdrmengine/mediacrypto/include \ vendor/widevine/libwvdrmengine/oemcrypto/include \ LOCAL_STATIC_LIBRARIES := \ diff --git a/libwvdrmengine/mediadrm/Android.bp b/libwvdrmengine/mediadrm/Android.bp index 68c7b2d8..ef9664dd 100644 --- a/libwvdrmengine/mediadrm/Android.bp +++ b/libwvdrmengine/mediadrm/Android.bp @@ -74,9 +74,9 @@ cc_library_static { name: "libwvdrmdrmplugin_aidl", srcs: [ - "aidl_src/WVDrmPlugin.cpp", - "aidl_src/WVGenericCryptoInterface.cpp", - "aidl_src/wv_metrics_adapter.cpp", + "src/WVDrmPlugin.cpp", + "src/WVGenericCryptoInterface.cpp", + "src/wv_metrics_adapter.cpp", ], include_dirs: [ @@ -86,9 +86,8 @@ 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/mediadrm/aidl_include", + "vendor/widevine/libwvdrmengine/mediadrm/include", "vendor/widevine/libwvdrmengine/oemcrypto/include", ], @@ -117,9 +116,9 @@ cc_library_static { name: "libwvdrmdrmplugin_aidl_fuzz", srcs: [ - "aidl_src/WVDrmPlugin.cpp", - "aidl_src/WVGenericCryptoInterface.cpp", - "aidl_src/wv_metrics_adapter.cpp", + "src/WVDrmPlugin.cpp", + "src/WVGenericCryptoInterface.cpp", + "src/wv_metrics_adapter.cpp", ], include_dirs: [ @@ -129,9 +128,8 @@ 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/mediadrm/aidl_include", + "vendor/widevine/libwvdrmengine/mediadrm/include", "vendor/widevine/libwvdrmengine/oemcrypto/include", ], diff --git a/libwvdrmengine/mediadrm/aidl_include/WVDrmPlugin.h b/libwvdrmengine/mediadrm/include/WVDrmPlugin.h similarity index 100% rename from libwvdrmengine/mediadrm/aidl_include/WVDrmPlugin.h rename to libwvdrmengine/mediadrm/include/WVDrmPlugin.h diff --git a/libwvdrmengine/mediadrm/aidl_include/WVGenericCryptoInterface.h b/libwvdrmengine/mediadrm/include/WVGenericCryptoInterface.h similarity index 100% rename from libwvdrmengine/mediadrm/aidl_include/WVGenericCryptoInterface.h rename to libwvdrmengine/mediadrm/include/WVGenericCryptoInterface.h diff --git a/libwvdrmengine/mediadrm/aidl_include/wv_metrics_adapter.h b/libwvdrmengine/mediadrm/include/wv_metrics_adapter.h similarity index 100% rename from libwvdrmengine/mediadrm/aidl_include/wv_metrics_adapter.h rename to libwvdrmengine/mediadrm/include/wv_metrics_adapter.h diff --git a/libwvdrmengine/mediadrm/include_hidl/WVDrmPlugin.h b/libwvdrmengine/mediadrm/include_hidl/WVDrmPlugin.h index 7e98a813..5709960d 100644 --- a/libwvdrmengine/mediadrm/include_hidl/WVDrmPlugin.h +++ b/libwvdrmengine/mediadrm/include_hidl/WVDrmPlugin.h @@ -13,9 +13,9 @@ #include #include "HidlTypes.h" +#include "HidlWVTypes.h" #include "OEMCryptoCENC.h" #include "WVGenericCryptoInterface.h" -#include "WVTypes.h" #include "cdm_client_property_set.h" #include "cdm_identifier.h" #include "log.h" diff --git a/libwvdrmengine/mediadrm/aidl_src/WVDrmPlugin.cpp b/libwvdrmengine/mediadrm/src/WVDrmPlugin.cpp similarity index 100% rename from libwvdrmengine/mediadrm/aidl_src/WVDrmPlugin.cpp rename to libwvdrmengine/mediadrm/src/WVDrmPlugin.cpp diff --git a/libwvdrmengine/mediadrm/aidl_src/WVGenericCryptoInterface.cpp b/libwvdrmengine/mediadrm/src/WVGenericCryptoInterface.cpp similarity index 100% rename from libwvdrmengine/mediadrm/aidl_src/WVGenericCryptoInterface.cpp rename to libwvdrmengine/mediadrm/src/WVGenericCryptoInterface.cpp diff --git a/libwvdrmengine/mediadrm/aidl_src/wv_metrics_adapter.cpp b/libwvdrmengine/mediadrm/src/wv_metrics_adapter.cpp similarity index 100% rename from libwvdrmengine/mediadrm/aidl_src/wv_metrics_adapter.cpp rename to libwvdrmengine/mediadrm/src/wv_metrics_adapter.cpp diff --git a/libwvdrmengine/mediadrm/src_hidl/WVDrmPlugin.cpp b/libwvdrmengine/mediadrm/src_hidl/WVDrmPlugin.cpp index 8731f0c4..39073f42 100644 --- a/libwvdrmengine/mediadrm/src_hidl/WVDrmPlugin.cpp +++ b/libwvdrmengine/mediadrm/src_hidl/WVDrmPlugin.cpp @@ -17,12 +17,12 @@ #include #include +#include "HidlMapErrors-inl.h" #include "HidlTypes.h" #include "TypeConvert.h" #include "android-base/macros.h" #include "hidl_metrics_adapter.h" #include "log.h" -#include "mapErrors-inl.h" #include "media/stagefright/MediaErrors.h" #include "openssl/sha.h" #include "wv_cdm_constants.h" diff --git a/libwvdrmengine/mediadrm/test/Android.mk b/libwvdrmengine/mediadrm/test/Android.mk index c6db1acb..428e652f 100644 --- a/libwvdrmengine/mediadrm/test/Android.mk +++ b/libwvdrmengine/mediadrm/test/Android.mk @@ -65,9 +65,8 @@ LOCAL_C_INCLUDES := \ 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/mediadrm/aidl_include \ + vendor/widevine/libwvdrmengine/mediadrm/include \ vendor/widevine/libwvdrmengine/oemcrypto/include \ LOCAL_STATIC_LIBRARIES := \ @@ -175,9 +174,8 @@ LOCAL_C_INCLUDES := \ 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/mediadrm/aidl_include \ + vendor/widevine/libwvdrmengine/mediadrm/include \ vendor/widevine/libwvdrmengine/oemcrypto/include \ LOCAL_STATIC_LIBRARIES := \ diff --git a/libwvdrmengine/aidl_src/WVCreatePluginFactories.cpp b/libwvdrmengine/src/WVCreatePluginFactories.cpp similarity index 100% rename from libwvdrmengine/aidl_src/WVCreatePluginFactories.cpp rename to libwvdrmengine/src/WVCreatePluginFactories.cpp diff --git a/libwvdrmengine/aidl_src/WVDrmFactory.cpp b/libwvdrmengine/src/WVDrmFactory.cpp similarity index 100% rename from libwvdrmengine/aidl_src/WVDrmFactory.cpp rename to libwvdrmengine/src/WVDrmFactory.cpp diff --git a/libwvdrmengine/aidl_src/android.hardware.drm-service-lazy.widevine.rc b/libwvdrmengine/src/android.hardware.drm-service-lazy.widevine.rc similarity index 100% rename from libwvdrmengine/aidl_src/android.hardware.drm-service-lazy.widevine.rc rename to libwvdrmengine/src/android.hardware.drm-service-lazy.widevine.rc diff --git a/libwvdrmengine/aidl_src/android.hardware.drm-service.widevine.rc b/libwvdrmengine/src/android.hardware.drm-service.widevine.rc similarity index 100% rename from libwvdrmengine/aidl_src/android.hardware.drm-service.widevine.rc rename to libwvdrmengine/src/android.hardware.drm-service.widevine.rc diff --git a/libwvdrmengine/aidl_src/fuzzer/README.md b/libwvdrmengine/src/fuzzer/README.md similarity index 100% rename from libwvdrmengine/aidl_src/fuzzer/README.md rename to libwvdrmengine/src/fuzzer/README.md diff --git a/libwvdrmengine/aidl_src/fuzzer/fuzzer.cpp b/libwvdrmengine/src/fuzzer/fuzzer.cpp similarity index 100% rename from libwvdrmengine/aidl_src/fuzzer/fuzzer.cpp rename to libwvdrmengine/src/fuzzer/fuzzer.cpp diff --git a/libwvdrmengine/aidl_src/service.cpp b/libwvdrmengine/src/service.cpp similarity index 100% rename from libwvdrmengine/aidl_src/service.cpp rename to libwvdrmengine/src/service.cpp diff --git a/libwvdrmengine/aidl_src/serviceLazy.cpp b/libwvdrmengine/src/serviceLazy.cpp similarity index 100% rename from libwvdrmengine/aidl_src/serviceLazy.cpp rename to libwvdrmengine/src/serviceLazy.cpp diff --git a/libwvdrmengine/aidl_src/wv_metrics.cpp b/libwvdrmengine/src/wv_metrics.cpp similarity index 100% rename from libwvdrmengine/aidl_src/wv_metrics.cpp rename to libwvdrmengine/src/wv_metrics.cpp diff --git a/libwvdrmengine/src_hidl/WVCreatePluginFactories.cpp b/libwvdrmengine/src_hidl/WVCreatePluginFactories.cpp index 46716924..6682a2a5 100644 --- a/libwvdrmengine/src_hidl/WVCreatePluginFactories.cpp +++ b/libwvdrmengine/src_hidl/WVCreatePluginFactories.cpp @@ -4,10 +4,10 @@ // Agreement. // -#include "WVCreatePluginFactories.h" +#include "HidlWVCreatePluginFactories.h" +#include "HidlWVDrmFactory.h" #include "WVCryptoFactory.h" -#include "WVDrmFactory.h" namespace wvdrm { namespace hardware { diff --git a/libwvdrmengine/src_hidl/WVDrmFactory.cpp b/libwvdrmengine/src_hidl/WVDrmFactory.cpp index 9ba12b34..bcabae33 100644 --- a/libwvdrmengine/src_hidl/WVDrmFactory.cpp +++ b/libwvdrmengine/src_hidl/WVDrmFactory.cpp @@ -6,7 +6,7 @@ //#define LOG_NDEBUG 0 #define LOG_TAG "WVCdm" -#include "WVDrmFactory.h" +#include "HidlWVDrmFactory.h" #include #include diff --git a/libwvdrmengine/src_hidl/service.cpp b/libwvdrmengine/src_hidl/service.cpp index 73963242..860d35f7 100644 --- a/libwvdrmengine/src_hidl/service.cpp +++ b/libwvdrmengine/src_hidl/service.cpp @@ -19,8 +19,8 @@ #include #include +#include "HidlWVDrmFactory.h" #include "WVCryptoFactory.h" -#include "WVDrmFactory.h" using wvdrm::hardware::drm::V1_4::widevine::WVCryptoFactory; using wvdrm::hardware::drm::V1_4::widevine::WVDrmFactory; diff --git a/libwvdrmengine/src_hidl/service@1.3.cpp b/libwvdrmengine/src_hidl/service@1.3.cpp index 7fc87b8a..9dd164b1 100644 --- a/libwvdrmengine/src_hidl/service@1.3.cpp +++ b/libwvdrmengine/src_hidl/service@1.3.cpp @@ -22,7 +22,7 @@ #include #include -#include "WVTypes.h" +#include "HidlWVTypes.h" namespace drm = ::android::hardware::drm; diff --git a/libwvdrmengine/src_hidl/serviceLazy.cpp b/libwvdrmengine/src_hidl/serviceLazy.cpp index 2341f901..ad961976 100644 --- a/libwvdrmengine/src_hidl/serviceLazy.cpp +++ b/libwvdrmengine/src_hidl/serviceLazy.cpp @@ -20,8 +20,8 @@ #include #include +#include "HidlWVDrmFactory.h" #include "WVCryptoFactory.h" -#include "WVDrmFactory.h" using wvdrm::hardware::drm::V1_4::widevine::WVCryptoFactory; using wvdrm::hardware::drm::V1_4::widevine::WVDrmFactory; diff --git a/libwvdrmengine/test/unit/Android.mk b/libwvdrmengine/test/unit/Android.mk index 639e2922..f0554ed7 100644 --- a/libwvdrmengine/test/unit/Android.mk +++ b/libwvdrmengine/test/unit/Android.mk @@ -53,9 +53,8 @@ LOCAL_SRC_FILES := \ LOCAL_C_INCLUDES := \ frameworks/av/include \ frameworks/native/include \ - vendor/widevine/libwvdrmengine/aidl_include \ vendor/widevine/libwvdrmengine/include \ - vendor/widevine/libwvdrmengine/mediadrm/aidl_include \ + vendor/widevine/libwvdrmengine/mediadrm/include \ vendor/widevine/libwvdrmengine/oemcrypto/include \ LOCAL_STATIC_LIBRARIES := \