Merge "Rename aidl_ include and src directories."

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",

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 {

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 {

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 {

libwvdrmengine/include_hidl/wv_metrics.h

@@ -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 <string>
-
-#include "wv_metrics.pb.h"
-
-namespace wv_metrics {
-void FormatWvCdmMetrics(const drm_metrics::WvCdmMetrics& metrics,
-                        std::string& result);
-}

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",
     ],
 

libwvdrmengine/mediacrypto/include_hidl/WVCryptoPlugin.h

@@ -13,9 +13,9 @@
 #include <mutex>
 
 #include "HidlTypes.h"
+#include "HidlWVTypes.h"
 #include "log.h"
 #include "wv_content_decryption_module.h"
-#include "WVTypes.h"
 
 namespace wvdrm {
 namespace hardware {

libwvdrmengine/mediacrypto/src_hidl/WVCryptoPlugin.cpp

@@ -14,9 +14,9 @@
 #include <hidlmemory/mapping.h>
 #include <iterator>
 
+#include "HidlMapErrors-inl.h"
 #include "HidlTypes.h"
 #include "log.h"
-#include "mapErrors-inl.h"
 #include "OEMCryptoCENC.h"
 #include "openssl/sha.h"
 #include "TypeConvert.h"

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 := \

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",
     ],
 

libwvdrmengine/mediadrm/include_hidl/WVDrmPlugin.h

@@ -13,9 +13,9 @@
 #include <map>
 
 #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"

libwvdrmengine/mediadrm/src_hidl/WVDrmPlugin.cpp

@@ -17,12 +17,12 @@
 #include <sstream>
 #include <string>
 
+#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"

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 := \

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 {

libwvdrmengine/src_hidl/WVDrmFactory.cpp

@@ -6,7 +6,7 @@
 
 //#define LOG_NDEBUG 0
 #define LOG_TAG "WVCdm"
-#include "WVDrmFactory.h"
+#include "HidlWVDrmFactory.h"
 
 #include <hwbinder/IPCThreadState.h>
 #include <utils/Log.h>

libwvdrmengine/src_hidl/service.cpp

@@ -19,8 +19,8 @@
 #include <binder/ProcessState.h>
 #include <hidl/HidlTransportSupport.h>
 
+#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;

libwvdrmengine/src_hidl/service@1.3.cpp

@@ -22,7 +22,7 @@
 #include <binder/ProcessState.h>
 #include <hidl/HidlTransportSupport.h>
 
-#include "WVTypes.h"
+#include "HidlWVTypes.h"
 
 namespace drm = ::android::hardware::drm;
 

libwvdrmengine/src_hidl/serviceLazy.cpp

@@ -20,8 +20,8 @@
 #include <hidl/HidlLazyUtils.h>
 #include <hidl/HidlTransportSupport.h>
 
+#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;

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 := \