aidl: memtrack: Rebrand to samsung and merge into one module

Change-Id: I0859a832d4b47f704b2799d5f4004c32901a15eb

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

aidl/memtrack/core/Android.bp

@@ -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__"
-    ],
-}

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"
 

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