libmedia_ecoservice: add and use aidl_interface am: bc97ba06e2

Original change: https://android-review.googlesource.com/c/platform/hardware/google/av/+/2917851

Change-Id: Iecfe9169b79e19891eebf30c1093097c69d5125a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

3 files changed, 49 insertions, 5 deletions

diff --git a/media/eco/Android.bp b/media/eco/Android.bp
index 18bc547..10a1d6c 100644
--- a/media/eco/Android.bp
+++ b/media/eco/Android.bp
@@ -3,15 +3,52 @@ package {
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
-filegroup {
+aidl_interface {
     name: "libmedia_ecoservice_aidl",
+    vendor_available: true,
+    owner: "google",
+    local_include_dir: "aidl",
     srcs: [
         "aidl/android/media/eco/IECOService.aidl",
         "aidl/android/media/eco/IECOSession.aidl",
         "aidl/android/media/eco/IECOServiceStatsProvider.aidl",
         "aidl/android/media/eco/IECOServiceInfoListener.aidl",
     ],
-    path: "aidl",
+    unstable: true,
+    backend: {
+        cpp: {
+            enabled: true,
+            additional_shared_libraries: [
+                "libmedia_ecoservice_ecodata",
+            ],
+        },
+        ndk: {
+            enabled: false,
+        },
+        java: {
+            enabled: false,
+        },
+    },
+}
+
+cc_library {
+    name: "libmedia_ecoservice_ecodata",
+    vendor_available: true,
+
+    srcs: [
+        "ECOData.cpp",
+    ],
+
+    export_include_dirs: [
+        "include",
+    ],
+
+    shared_libs: [
+        "libbase",
+        "libbinder",
+        "liblog",
+        "libutils",
+    ],
 }
 
 cc_library_shared {
@@ -19,8 +56,6 @@ cc_library_shared {
     vendor_available: true,
 
     srcs: [
-        ":libmedia_ecoservice_aidl",
-        "ECOData.cpp",
         "ECODebug.cpp",
         "ECOService.cpp",
         "ECOSession.cpp",
@@ -48,7 +83,10 @@ cc_library_shared {
     export_include_dirs: [
         "include",
     ],
-
+    whole_static_libs: [
+        "libmedia_ecoservice_ecodata",
+        "libmedia_ecoservice_aidl-cpp",
+    ],
     shared_libs: [
         "libbinder",
         "libcutils",
diff --git a/media/eco/ECOData.cpp b/media/eco/ECOData.cpp
index 189e609..3d7b533 100644
--- a/media/eco/ECOData.cpp
+++ b/media/eco/ECOData.cpp
@@ -416,6 +416,10 @@ std::string ECOData::debugString() const {
     return s;
 }
 
+std::string ECOData::toString() const {
+    return debugString();
+}
+
 }  // namespace eco
 }  // namespace media
 }  // namespace android
diff --git a/media/eco/include/eco/ECOData.h b/media/eco/include/eco/ECOData.h
index cb42982..737235a 100644
--- a/media/eco/include/eco/ECOData.h
+++ b/media/eco/include/eco/ECOData.h
@@ -161,6 +161,8 @@ public:
     // Dump the ECOData as a string.
     std::string debugString() const;
 
+    std::string toString() const;
+
 protected:
     // ValueType. This must match the index in ECODataValueType.
     enum ValueType {