From a7aa1c501332e94b7337c9d898c3a03a561f7fed Mon Sep 17 00:00:00 2001 From: Edwin Wong Date: Fri, 2 Sep 2022 17:17:20 +0000 Subject: [PATCH] Revert "Rename aidl_ include and src directories." This reverts commit 54007416013cbee7f3f659060b1cf9f25e3655ba. Reason for revert: broke hidl build Change-Id: I3954a1c0d6c0d7a663bd2a1c8c8888cae37cee80 --- libwvdrmengine/Android.bp | 63 +++++++------------ .../{include => aidl_include}/Utils.h | 0 .../WVCreatePluginFactories.h | 0 .../{include => aidl_include}/WVDrmFactory.h | 0 .../{include => aidl_include}/WVTypes.h | 0 .../{include => aidl_include}/mapErrors-inl.h | 0 .../{include => aidl_include}/wv_metrics.h | 0 .../WVCreatePluginFactories.cpp | 0 .../{src => aidl_src}/WVDrmFactory.cpp | 0 ...roid.hardware.drm-service-lazy.widevine.rc | 0 .../android.hardware.drm-service.widevine.rc | 0 .../{src => aidl_src}/fuzzer/README.md | 0 .../{src => aidl_src}/fuzzer/fuzzer.cpp | 0 libwvdrmengine/{src => aidl_src}/service.cpp | 0 .../{src => aidl_src}/serviceLazy.cpp | 0 .../{src => aidl_src}/wv_metrics.cpp | 0 libwvdrmengine/mediacrypto/Android.bp | 10 +-- .../WVCryptoPlugin.h | 0 .../{src => aidl_src}/WVCryptoPlugin.cpp | 0 libwvdrmengine/mediacrypto/test/Android.mk | 4 +- libwvdrmengine/mediadrm/Android.bp | 18 +++--- .../{include => aidl_include}/WVDrmPlugin.h | 0 .../WVGenericCryptoInterface.h | 0 .../wv_metrics_adapter.h | 0 .../{src => aidl_src}/WVDrmPlugin.cpp | 0 .../WVGenericCryptoInterface.cpp | 0 .../{src => aidl_src}/wv_metrics_adapter.cpp | 0 libwvdrmengine/mediadrm/test/Android.mk | 6 +- libwvdrmengine/test/unit/Android.mk | 3 +- 29 files changed, 45 insertions(+), 59 deletions(-) rename libwvdrmengine/{include => aidl_include}/Utils.h (100%) rename libwvdrmengine/{include => aidl_include}/WVCreatePluginFactories.h (100%) rename libwvdrmengine/{include => aidl_include}/WVDrmFactory.h (100%) rename libwvdrmengine/{include => aidl_include}/WVTypes.h (100%) rename libwvdrmengine/{include => aidl_include}/mapErrors-inl.h (100%) rename libwvdrmengine/{include => aidl_include}/wv_metrics.h (100%) rename libwvdrmengine/{src => aidl_src}/WVCreatePluginFactories.cpp (100%) rename libwvdrmengine/{src => aidl_src}/WVDrmFactory.cpp (100%) rename libwvdrmengine/{src => aidl_src}/android.hardware.drm-service-lazy.widevine.rc (100%) rename libwvdrmengine/{src => aidl_src}/android.hardware.drm-service.widevine.rc (100%) rename libwvdrmengine/{src => aidl_src}/fuzzer/README.md (100%) rename libwvdrmengine/{src => aidl_src}/fuzzer/fuzzer.cpp (100%) rename libwvdrmengine/{src => aidl_src}/service.cpp (100%) rename libwvdrmengine/{src => aidl_src}/serviceLazy.cpp (100%) rename libwvdrmengine/{src => aidl_src}/wv_metrics.cpp (100%) rename libwvdrmengine/mediacrypto/{include => aidl_include}/WVCryptoPlugin.h (100%) rename libwvdrmengine/mediacrypto/{src => aidl_src}/WVCryptoPlugin.cpp (100%) rename libwvdrmengine/mediadrm/{include => aidl_include}/WVDrmPlugin.h (100%) rename libwvdrmengine/mediadrm/{include => aidl_include}/WVGenericCryptoInterface.h (100%) rename libwvdrmengine/mediadrm/{include => aidl_include}/wv_metrics_adapter.h (100%) rename libwvdrmengine/mediadrm/{src => aidl_src}/WVDrmPlugin.cpp (100%) rename libwvdrmengine/mediadrm/{src => aidl_src}/WVGenericCryptoInterface.cpp (100%) rename libwvdrmengine/mediadrm/{src => aidl_src}/wv_metrics_adapter.cpp (100%) diff --git a/libwvdrmengine/Android.bp b/libwvdrmengine/Android.bp index 865b57be..ac7ec751 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/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", diff --git a/libwvdrmengine/include/Utils.h b/libwvdrmengine/aidl_include/Utils.h similarity index 100% rename from libwvdrmengine/include/Utils.h rename to libwvdrmengine/aidl_include/Utils.h diff --git a/libwvdrmengine/include/WVCreatePluginFactories.h b/libwvdrmengine/aidl_include/WVCreatePluginFactories.h similarity index 100% rename from libwvdrmengine/include/WVCreatePluginFactories.h rename to libwvdrmengine/aidl_include/WVCreatePluginFactories.h diff --git a/libwvdrmengine/include/WVDrmFactory.h b/libwvdrmengine/aidl_include/WVDrmFactory.h similarity index 100% rename from libwvdrmengine/include/WVDrmFactory.h rename to libwvdrmengine/aidl_include/WVDrmFactory.h diff --git a/libwvdrmengine/include/WVTypes.h b/libwvdrmengine/aidl_include/WVTypes.h similarity index 100% rename from libwvdrmengine/include/WVTypes.h rename to libwvdrmengine/aidl_include/WVTypes.h diff --git a/libwvdrmengine/include/mapErrors-inl.h b/libwvdrmengine/aidl_include/mapErrors-inl.h similarity index 100% rename from libwvdrmengine/include/mapErrors-inl.h rename to libwvdrmengine/aidl_include/mapErrors-inl.h diff --git a/libwvdrmengine/include/wv_metrics.h b/libwvdrmengine/aidl_include/wv_metrics.h similarity index 100% rename from libwvdrmengine/include/wv_metrics.h rename to libwvdrmengine/aidl_include/wv_metrics.h diff --git a/libwvdrmengine/src/WVCreatePluginFactories.cpp b/libwvdrmengine/aidl_src/WVCreatePluginFactories.cpp similarity index 100% rename from libwvdrmengine/src/WVCreatePluginFactories.cpp rename to libwvdrmengine/aidl_src/WVCreatePluginFactories.cpp diff --git a/libwvdrmengine/src/WVDrmFactory.cpp b/libwvdrmengine/aidl_src/WVDrmFactory.cpp similarity index 100% rename from libwvdrmengine/src/WVDrmFactory.cpp rename to libwvdrmengine/aidl_src/WVDrmFactory.cpp diff --git a/libwvdrmengine/src/android.hardware.drm-service-lazy.widevine.rc b/libwvdrmengine/aidl_src/android.hardware.drm-service-lazy.widevine.rc similarity index 100% rename from libwvdrmengine/src/android.hardware.drm-service-lazy.widevine.rc rename to libwvdrmengine/aidl_src/android.hardware.drm-service-lazy.widevine.rc diff --git a/libwvdrmengine/src/android.hardware.drm-service.widevine.rc b/libwvdrmengine/aidl_src/android.hardware.drm-service.widevine.rc similarity index 100% rename from libwvdrmengine/src/android.hardware.drm-service.widevine.rc rename to libwvdrmengine/aidl_src/android.hardware.drm-service.widevine.rc diff --git a/libwvdrmengine/src/fuzzer/README.md b/libwvdrmengine/aidl_src/fuzzer/README.md similarity index 100% rename from libwvdrmengine/src/fuzzer/README.md rename to libwvdrmengine/aidl_src/fuzzer/README.md diff --git a/libwvdrmengine/src/fuzzer/fuzzer.cpp b/libwvdrmengine/aidl_src/fuzzer/fuzzer.cpp similarity index 100% rename from libwvdrmengine/src/fuzzer/fuzzer.cpp rename to libwvdrmengine/aidl_src/fuzzer/fuzzer.cpp diff --git a/libwvdrmengine/src/service.cpp b/libwvdrmengine/aidl_src/service.cpp similarity index 100% rename from libwvdrmengine/src/service.cpp rename to libwvdrmengine/aidl_src/service.cpp diff --git a/libwvdrmengine/src/serviceLazy.cpp b/libwvdrmengine/aidl_src/serviceLazy.cpp similarity index 100% rename from libwvdrmengine/src/serviceLazy.cpp rename to libwvdrmengine/aidl_src/serviceLazy.cpp diff --git a/libwvdrmengine/src/wv_metrics.cpp b/libwvdrmengine/aidl_src/wv_metrics.cpp similarity index 100% rename from libwvdrmengine/src/wv_metrics.cpp rename to libwvdrmengine/aidl_src/wv_metrics.cpp diff --git a/libwvdrmengine/mediacrypto/Android.bp b/libwvdrmengine/mediacrypto/Android.bp index 3c288463..0255cebf 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: ["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", ], diff --git a/libwvdrmengine/mediacrypto/include/WVCryptoPlugin.h b/libwvdrmengine/mediacrypto/aidl_include/WVCryptoPlugin.h similarity index 100% rename from libwvdrmengine/mediacrypto/include/WVCryptoPlugin.h rename to libwvdrmengine/mediacrypto/aidl_include/WVCryptoPlugin.h diff --git a/libwvdrmengine/mediacrypto/src/WVCryptoPlugin.cpp b/libwvdrmengine/mediacrypto/aidl_src/WVCryptoPlugin.cpp similarity index 100% rename from libwvdrmengine/mediacrypto/src/WVCryptoPlugin.cpp rename to libwvdrmengine/mediacrypto/aidl_src/WVCryptoPlugin.cpp diff --git a/libwvdrmengine/mediacrypto/test/Android.mk b/libwvdrmengine/mediacrypto/test/Android.mk index fab60ef8..5baaf873 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/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 := \ diff --git a/libwvdrmengine/mediadrm/Android.bp b/libwvdrmengine/mediadrm/Android.bp index ef9664dd..68c7b2d8 100644 --- a/libwvdrmengine/mediadrm/Android.bp +++ b/libwvdrmengine/mediadrm/Android.bp @@ -74,9 +74,9 @@ cc_library_static { name: "libwvdrmdrmplugin_aidl", srcs: [ - "src/WVDrmPlugin.cpp", - "src/WVGenericCryptoInterface.cpp", - "src/wv_metrics_adapter.cpp", + "aidl_src/WVDrmPlugin.cpp", + "aidl_src/WVGenericCryptoInterface.cpp", + "aidl_src/wv_metrics_adapter.cpp", ], include_dirs: [ @@ -86,8 +86,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/mediadrm/include", + "vendor/widevine/libwvdrmengine/mediadrm/aidl_include", "vendor/widevine/libwvdrmengine/oemcrypto/include", ], @@ -116,9 +117,9 @@ cc_library_static { name: "libwvdrmdrmplugin_aidl_fuzz", srcs: [ - "src/WVDrmPlugin.cpp", - "src/WVGenericCryptoInterface.cpp", - "src/wv_metrics_adapter.cpp", + "aidl_src/WVDrmPlugin.cpp", + "aidl_src/WVGenericCryptoInterface.cpp", + "aidl_src/wv_metrics_adapter.cpp", ], include_dirs: [ @@ -128,8 +129,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/mediadrm/include", + "vendor/widevine/libwvdrmengine/mediadrm/aidl_include", "vendor/widevine/libwvdrmengine/oemcrypto/include", ], diff --git a/libwvdrmengine/mediadrm/include/WVDrmPlugin.h b/libwvdrmengine/mediadrm/aidl_include/WVDrmPlugin.h similarity index 100% rename from libwvdrmengine/mediadrm/include/WVDrmPlugin.h rename to libwvdrmengine/mediadrm/aidl_include/WVDrmPlugin.h diff --git a/libwvdrmengine/mediadrm/include/WVGenericCryptoInterface.h b/libwvdrmengine/mediadrm/aidl_include/WVGenericCryptoInterface.h similarity index 100% rename from libwvdrmengine/mediadrm/include/WVGenericCryptoInterface.h rename to libwvdrmengine/mediadrm/aidl_include/WVGenericCryptoInterface.h diff --git a/libwvdrmengine/mediadrm/include/wv_metrics_adapter.h b/libwvdrmengine/mediadrm/aidl_include/wv_metrics_adapter.h similarity index 100% rename from libwvdrmengine/mediadrm/include/wv_metrics_adapter.h rename to libwvdrmengine/mediadrm/aidl_include/wv_metrics_adapter.h diff --git a/libwvdrmengine/mediadrm/src/WVDrmPlugin.cpp b/libwvdrmengine/mediadrm/aidl_src/WVDrmPlugin.cpp similarity index 100% rename from libwvdrmengine/mediadrm/src/WVDrmPlugin.cpp rename to libwvdrmengine/mediadrm/aidl_src/WVDrmPlugin.cpp diff --git a/libwvdrmengine/mediadrm/src/WVGenericCryptoInterface.cpp b/libwvdrmengine/mediadrm/aidl_src/WVGenericCryptoInterface.cpp similarity index 100% rename from libwvdrmengine/mediadrm/src/WVGenericCryptoInterface.cpp rename to libwvdrmengine/mediadrm/aidl_src/WVGenericCryptoInterface.cpp diff --git a/libwvdrmengine/mediadrm/src/wv_metrics_adapter.cpp b/libwvdrmengine/mediadrm/aidl_src/wv_metrics_adapter.cpp similarity index 100% rename from libwvdrmengine/mediadrm/src/wv_metrics_adapter.cpp rename to libwvdrmengine/mediadrm/aidl_src/wv_metrics_adapter.cpp diff --git a/libwvdrmengine/mediadrm/test/Android.mk b/libwvdrmengine/mediadrm/test/Android.mk index 428e652f..c6db1acb 100644 --- a/libwvdrmengine/mediadrm/test/Android.mk +++ b/libwvdrmengine/mediadrm/test/Android.mk @@ -65,8 +65,9 @@ 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/include \ + vendor/widevine/libwvdrmengine/mediadrm/aidl_include \ vendor/widevine/libwvdrmengine/oemcrypto/include \ LOCAL_STATIC_LIBRARIES := \ @@ -174,8 +175,9 @@ 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/include \ + vendor/widevine/libwvdrmengine/mediadrm/aidl_include \ vendor/widevine/libwvdrmengine/oemcrypto/include \ LOCAL_STATIC_LIBRARIES := \ diff --git a/libwvdrmengine/test/unit/Android.mk b/libwvdrmengine/test/unit/Android.mk index f0554ed7..639e2922 100644 --- a/libwvdrmengine/test/unit/Android.mk +++ b/libwvdrmengine/test/unit/Android.mk @@ -53,8 +53,9 @@ 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/include \ + vendor/widevine/libwvdrmengine/mediadrm/aidl_include \ vendor/widevine/libwvdrmengine/oemcrypto/include \ LOCAL_STATIC_LIBRARIES := \