memtrack: Rebrand to mediatek mali and merge into one module
Change-Id: I0859a832d4b47f704b2799d5f4004c32901a15eb
diff --git a/aidl/memtrack/Android.bp b/aidl/memtrack/Android.bp
new file mode 100644
index 0000000..5ad77a9
--- /dev/null
+++ b/aidl/memtrack/Android.bp
@@ -0,0 +1,19 @@
+cc_binary {
+ name: "android.hardware.memtrack-service.mediatek-mali",
+ relative_install_path: "hw",
+ init_rc: ["memtrack_default.rc"],
+ vintf_fragments: ["memtrack_default.xml"],
+ vendor: true,
+ shared_libs: [
+ "android.hardware.memtrack-V1-ndk",
+ "libbase",
+ "libbinder_ndk",
+ "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 cfce23e..0000000
--- 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 facc4c1..bef3745 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_default.rc
similarity index 77%
rename from aidl/memtrack/service/memtrack.rc
rename to aidl/memtrack/memtrack_default.rc
index 02f5a69..c0aaa21 100644
--- a/aidl/memtrack/service/memtrack.rc
+++ b/aidl/memtrack/memtrack_default.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.mediatek-mali
class hal
user graphics
group system
diff --git a/aidl/memtrack/service/memtrack.xml b/aidl/memtrack/memtrack_default.xml
similarity index 100%
rename from aidl/memtrack/service/memtrack.xml
rename to aidl/memtrack/memtrack_default.xml
diff --git a/aidl/memtrack/service/Android.bp b/aidl/memtrack/service/Android.bp
deleted file mode 100644
index f408496..0000000
--- a/aidl/memtrack/service/Android.bp
+++ /dev/null
@@ -1,20 +0,0 @@
-package {
- default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
-cc_binary {
- name: "android.hardware.memtrack-service.pixel",
- relative_install_path: "hw",
- init_rc: ["memtrack.rc"],
- vintf_fragments: ["memtrack.xml"],
- vendor: true,
- shared_libs: [
- "android.hardware.memtrack-V1-ndk",
- "libbase",
- "libbinder_ndk",
- "libmemtrack-pixel",
- ],
- srcs: [
- "main.cpp",
- ],
-}