From 22ffc81c3b583cc50f0e343667f3bf34036eab46 Mon Sep 17 00:00:00 2001
From: Tim Zimmermann <tim@linux4.de>
Date: Fri, 9 Sep 2022 15:17:16 +0200
Subject: [PATCH] aidl: memtrack: Rebrand to samsung and merge into one module

Change-Id: I0859a832d4b47f704b2799d5f4004c32901a15eb
---
 aidl/memtrack/{service => }/Android.bp      | 11 +++----
 aidl/memtrack/{core => }/GpuSysfsReader.cpp |  0
 aidl/memtrack/{core => }/GpuSysfsReader.h   |  0
 aidl/memtrack/{core => }/Memtrack.cpp       |  0
 aidl/memtrack/{core/include => }/Memtrack.h |  0
 aidl/memtrack/core/Android.bp               | 34 ---------------------
 aidl/memtrack/{core => }/filesystem.cpp     |  0
 aidl/memtrack/{core => }/filesystem.h       |  0
 aidl/memtrack/{service => }/main.cpp        |  3 +-
 aidl/memtrack/{service => }/memtrack.rc     |  2 +-
 aidl/memtrack/{service => }/memtrack.xml    |  0
 11 files changed, 8 insertions(+), 42 deletions(-)
 rename aidl/memtrack/{service => }/Android.bp (64%)
 rename aidl/memtrack/{core => }/GpuSysfsReader.cpp (100%)
 rename aidl/memtrack/{core => }/GpuSysfsReader.h (100%)
 rename aidl/memtrack/{core => }/Memtrack.cpp (100%)
 rename aidl/memtrack/{core/include => }/Memtrack.h (100%)
 delete mode 100644 aidl/memtrack/core/Android.bp
 rename aidl/memtrack/{core => }/filesystem.cpp (100%)
 rename aidl/memtrack/{core => }/filesystem.h (100%)
 rename aidl/memtrack/{service => }/main.cpp (96%)
 rename aidl/memtrack/{service => }/memtrack.rc (79%)
 rename aidl/memtrack/{service => }/memtrack.xml (100%)

diff --git a/aidl/memtrack/service/Android.bp b/aidl/memtrack/Android.bp
similarity index 64%
rename from aidl/memtrack/service/Android.bp
rename to aidl/memtrack/Android.bp
index f4084961..39ff0c9c 100644
--- a/aidl/memtrack/service/Android.bp
+++ b/aidl/memtrack/Android.bp
@@ -1,9 +1,5 @@
-package {
-    default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
 cc_binary {
-    name: "android.hardware.memtrack-service.pixel",
+    name: "android.hardware.memtrack-service.samsung-mali",
     relative_install_path: "hw",
     init_rc: ["memtrack.rc"],
     vintf_fragments: ["memtrack.xml"],
@@ -12,9 +8,12 @@ cc_binary {
         "android.hardware.memtrack-V1-ndk",
         "libbase",
         "libbinder_ndk",
-        "libmemtrack-pixel",
+        "liblog",
     ],
     srcs: [
+        "Memtrack.cpp",
+        "GpuSysfsReader.cpp",
+        "filesystem.cpp",
         "main.cpp",
     ],
 }
diff --git a/aidl/memtrack/core/GpuSysfsReader.cpp b/aidl/memtrack/GpuSysfsReader.cpp
similarity index 100%
rename from aidl/memtrack/core/GpuSysfsReader.cpp
rename to aidl/memtrack/GpuSysfsReader.cpp
diff --git a/aidl/memtrack/core/GpuSysfsReader.h b/aidl/memtrack/GpuSysfsReader.h
similarity index 100%
rename from aidl/memtrack/core/GpuSysfsReader.h
rename to aidl/memtrack/GpuSysfsReader.h
diff --git a/aidl/memtrack/core/Memtrack.cpp b/aidl/memtrack/Memtrack.cpp
similarity index 100%
rename from aidl/memtrack/core/Memtrack.cpp
rename to aidl/memtrack/Memtrack.cpp
diff --git a/aidl/memtrack/core/include/Memtrack.h b/aidl/memtrack/Memtrack.h
similarity index 100%
rename from aidl/memtrack/core/include/Memtrack.h
rename to aidl/memtrack/Memtrack.h
diff --git a/aidl/memtrack/core/Android.bp b/aidl/memtrack/core/Android.bp
deleted file mode 100644
index cfce23ec..00000000
--- a/aidl/memtrack/core/Android.bp
+++ /dev/null
@@ -1,34 +0,0 @@
-
-package {
-    default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
-cc_library_shared {
-    name: "libmemtrack-pixel",
-    vendor: true,
-    srcs: [
-        "Memtrack.cpp",
-        "GpuSysfsReader.cpp",
-        "filesystem.cpp",
-    ],
-    export_include_dirs: [
-        "include",
-    ],
-    shared_libs: [
-        "android.hardware.memtrack-V1-ndk",
-        "libbase",
-        "libbinder_ndk",
-        "liblog",
-    ],
-    cppflags: [
-        "-Wall",
-        "-Werror",
-        "-Wformat",
-        "-Wthread-safety",
-        "-Wunused",
-        "-Wunreachable-code",
-    ],
-    visibility: [
-        "//hardware/google/graphics/common/memtrack-pixel/service:__pkg__"
-    ],
-}
diff --git a/aidl/memtrack/core/filesystem.cpp b/aidl/memtrack/filesystem.cpp
similarity index 100%
rename from aidl/memtrack/core/filesystem.cpp
rename to aidl/memtrack/filesystem.cpp
diff --git a/aidl/memtrack/core/filesystem.h b/aidl/memtrack/filesystem.h
similarity index 100%
rename from aidl/memtrack/core/filesystem.h
rename to aidl/memtrack/filesystem.h
diff --git a/aidl/memtrack/service/main.cpp b/aidl/memtrack/main.cpp
similarity index 96%
rename from aidl/memtrack/service/main.cpp
rename to aidl/memtrack/main.cpp
index facc4c19..bef3745e 100644
--- a/aidl/memtrack/service/main.cpp
+++ b/aidl/memtrack/main.cpp
@@ -1,8 +1,9 @@
-#include <Memtrack.h>
 #include <android-base/logging.h>
 #include <android/binder_manager.h>
 #include <android/binder_process.h>
 
+#include "Memtrack.h"
+
 #undef LOG_TAG
 #define LOG_TAG "memtrack-service"
 
diff --git a/aidl/memtrack/service/memtrack.rc b/aidl/memtrack/memtrack.rc
similarity index 79%
rename from aidl/memtrack/service/memtrack.rc
rename to aidl/memtrack/memtrack.rc
index 02f5a692..3a2a26e1 100644
--- a/aidl/memtrack/service/memtrack.rc
+++ b/aidl/memtrack/memtrack.rc
@@ -1,4 +1,4 @@
-service vendor.memtrack-default /vendor/bin/hw/android.hardware.memtrack-service.pixel
+service vendor.memtrack-default /vendor/bin/hw/android.hardware.memtrack-service.samsung-mali
     class hal
     user graphics
     group system
diff --git a/aidl/memtrack/service/memtrack.xml b/aidl/memtrack/memtrack.xml
similarity index 100%
rename from aidl/memtrack/service/memtrack.xml
rename to aidl/memtrack/memtrack.xml