commit 4bc21ceb1c563455353abd0bbd1aeaf82726d416
author Arun Kumar K.R <akumarkr@codeaurora.org> Mon Nov 11 18:45:42 2013 -0800
committer Arun Kumar K.R <akumarkr@codeaurora.org> Tue Nov 12 10:26:24 2013 -0800
tree af1aa1880132a9b9b07dcd310e28472ca83f9fc0
parent 6a530a386f38b4ebe1dfa260499f834b33cfd291

libmemtrack: Add correct target information

- Add correct target information to make file
- Remove incorrect target names in the src files
- replace sprintf(banned api) with snprintf

Change-Id: I846ff3d5dcc5acc843c2c83506deafadd30b4942

libmemtrack/Android.mk

diff --git a/libmemtrack/Android.mk b/libmemtrack/Android.mk
index ade8d7a..306eb07 100644
--- a/libmemtrack/Android.mk
+++ b/libmemtrack/Android.mk
@@ -22,5 +22,5 @@
 LOCAL_C_INCLUDES += hardware/libhardware/include
 LOCAL_SHARED_LIBRARIES := liblog
 LOCAL_SRC_FILES := memtrack_msm.c kgsl.c
-LOCAL_MODULE := memtrack.msm8960
+LOCAL_MODULE := memtrack.$(TARGET_BOARD_PLATFORM)
 include $(BUILD_SHARED_LIBRARY)

libmemtrack/kgsl.c

diff --git a/libmemtrack/kgsl.c b/libmemtrack/kgsl.c
index ecd5d37..4843742 100644
--- a/libmemtrack/kgsl.c
+++ b/libmemtrack/kgsl.c
@@ -64,14 +64,14 @@
     memcpy(records, record_templates,
            sizeof(struct memtrack_record) * allocated_records);
 
-    sprintf(tmp, "/d/kgsl/proc/%d/mem", pid);
+    snprintf(tmp, sizeof(tmp), "/d/kgsl/proc/%d/mem", pid);
     fp = fopen(tmp, "r");
     if (fp == NULL) {
         return -errno;
     }
 
     if (type == MEMTRACK_TYPE_GL) {
-        sprintf(tmp, "/proc/%d/smaps", pid);
+        snprintf(tmp, sizeof(tmp), "/proc/%d/smaps", pid);
         smaps_fp = fopen(tmp, "r");
         if (smaps_fp == NULL) {
             return -errno;

libmemtrack/memtrack_msm.c

diff --git a/libmemtrack/memtrack_msm.c b/libmemtrack/memtrack_msm.c
index 6044c8c..6626b89 100644
--- a/libmemtrack/memtrack_msm.c
+++ b/libmemtrack/memtrack_msm.c
@@ -20,12 +20,12 @@
 
 #include "memtrack_msm.h"
 
-int exynos5_memtrack_init(const struct memtrack_module *module)
+int msm_memtrack_init(const struct memtrack_module *module)
 {
     return 0;
 }
 
-int exynos5_memtrack_get_memory(const struct memtrack_module *module,
+int msm_memtrack_get_memory(const struct memtrack_module *module,
                                 pid_t pid,
                                 enum memtrack_type type,
                                 struct memtrack_record *records,
@@ -48,12 +48,12 @@
         module_api_version: MEMTRACK_MODULE_API_VERSION_0_1,
         hal_api_version: HARDWARE_HAL_API_VERSION,
         id: MEMTRACK_HARDWARE_MODULE_ID,
-        name: "Exynos5 Memory Tracker HAL",
+        name: "MSM Memory Tracker HAL",
         author: "The Android Open Source Project",
         methods: &memtrack_module_methods,
     },
 
-    init: exynos5_memtrack_init,
-    getMemory: exynos5_memtrack_get_memory,
+    init: msm_memtrack_init,
+    getMemory: msm_memtrack_get_memory,
 };
 

libmemtrack/memtrack_msm.h

diff --git a/libmemtrack/memtrack_msm.h b/libmemtrack/memtrack_msm.h
index cfdefc0..ff2db3c 100644
--- a/libmemtrack/memtrack_msm.h
+++ b/libmemtrack/memtrack_msm.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef _MEMTRACK_EXYNOS5_H_
-#define _MEMTRACK_EXYNOS5_H_
+#ifndef _MEMTRACK_QCOM_H_
+#define _MEMTRACK_QCOM_H_
 
 int kgsl_memtrack_get_memory(pid_t pid, enum memtrack_type type,
                              struct memtrack_record *records,