Rename aidl_ include and src directories.

Test: unit tests
Test: Google TV and Netflix
Test: atest GtsMediaTestCases

Bug: 216527109
Change-Id: I3fd02c2c60da588dba3db27cea3593de25a7180f

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