Merge "Revert "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/include",
+        "vendor/widevine/libwvdrmengine/aidl_include",
-        "vendor/widevine/libwvdrmengine/mediadrm/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",
+        "aidl_src/wv_metrics.cpp",
-        "src/WVCreatePluginFactories.cpp",
+        "aidl_src/WVCreatePluginFactories.cpp",
-        "src/WVDrmFactory.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/mediacrypto/aidl_include",
-        "vendor/widevine/libwvdrmengine/mediadrm/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",
+        "aidl_src/wv_metrics.cpp",
-        "src/WVCreatePluginFactories.cpp",
+        "aidl_src/WVCreatePluginFactories.cpp",
-        "src/WVDrmFactory.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/mediacrypto/aidl_include",
-        "vendor/widevine/libwvdrmengine/mediadrm/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/aidl_include",
-        "vendor/widevine/libwvdrmengine/mediadrm/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: [
+    srcs: ["aidl_src/fuzzer/fuzzer.cpp"],
-        "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/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",
     ],
 

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/aidl_include \
-  vendor/widevine/libwvdrmengine/mediacrypto/include \
+  vendor/widevine/libwvdrmengine/mediacrypto/aidl_include \
   vendor/widevine/libwvdrmengine/oemcrypto/include \
 
 LOCAL_STATIC_LIBRARIES := \

libwvdrmengine/mediadrm/Android.bp

@@ -74,9 +74,9 @@ cc_library_static {
     name: "libwvdrmdrmplugin_aidl",
 
     srcs: [
-        "src/WVDrmPlugin.cpp",
+        "aidl_src/WVDrmPlugin.cpp",
-        "src/WVGenericCryptoInterface.cpp",
+        "aidl_src/WVGenericCryptoInterface.cpp",
-        "src/wv_metrics_adapter.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",
+        "aidl_src/WVDrmPlugin.cpp",
-        "src/WVGenericCryptoInterface.cpp",
+        "aidl_src/WVGenericCryptoInterface.cpp",
-        "src/wv_metrics_adapter.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",
     ],
 

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

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