summaryrefslogtreecommitdiff
path: root/libmemtrack
diff options
context:
space:
mode:
authorNaseer Ahmed <naseer@codeaurora.org>2015-11-02 20:34:29 -0500
committerNaseer Ahmed <naseer@codeaurora.org>2015-11-03 08:02:01 -0500
commitb8ecfbf5a7106bb57f55921da76c1f3e1e897b42 (patch)
tree2cfc1d1bcfaee761561a375f0dc89889f947cd06 /libmemtrack
parentefd6a3531638a2ed1b0de49b7f5b2a7f8035b3f5 (diff)
downloaddisplay-b8ecfbf5a7106bb57f55921da76c1f3e1e897b42.tar.gz
display: Enable clang for all display modules
Change-Id: I71e3fa3f7d44253b8e01d1eafe086b1898d65a8e
Diffstat (limited to 'libmemtrack')
-rw-r--r--libmemtrack/Android.mk3
-rw-r--r--libmemtrack/kgsl.c2
-rw-r--r--libmemtrack/memtrack_msm.c20
3 files changed, 12 insertions, 13 deletions
diff --git a/libmemtrack/Android.mk b/libmemtrack/Android.mk
index 3ed37a33..4e7a09f8 100644
--- a/libmemtrack/Android.mk
+++ b/libmemtrack/Android.mk
@@ -20,7 +20,8 @@ include $(CLEAR_VARS)
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_C_INCLUDES += hardware/libhardware/include
-LOCAL_CFAGS := -Wconversion -Wall -Werror
+LOCAL_CFLAGS := -Wconversion -Wall -Werror -Wno-sign-conversion
+LOCAL_CLANG := true
LOCAL_SHARED_LIBRARIES := liblog
LOCAL_SRC_FILES := memtrack_msm.c kgsl.c
LOCAL_MODULE := memtrack.$(TARGET_BOARD_PLATFORM)
diff --git a/libmemtrack/kgsl.c b/libmemtrack/kgsl.c
index 6dc9774a..958859ae 100644
--- a/libmemtrack/kgsl.c
+++ b/libmemtrack/kgsl.c
@@ -45,14 +45,12 @@ int kgsl_memtrack_get_memory(pid_t pid, enum memtrack_type type,
size_t *num_records)
{
size_t allocated_records = min(*num_records, ARRAY_SIZE(record_templates));
- int i;
FILE *fp;
char line[1024];
char tmp[128];
bool is_surfaceflinger = false;
size_t accounted_size = 0;
size_t unaccounted_size = 0;
- unsigned long smaps_addr = 0;
*num_records = ARRAY_SIZE(record_templates);
diff --git a/libmemtrack/memtrack_msm.c b/libmemtrack/memtrack_msm.c
index 8adff965..e369d5fd 100644
--- a/libmemtrack/memtrack_msm.c
+++ b/libmemtrack/memtrack_msm.c
@@ -47,17 +47,17 @@ static struct hw_module_methods_t memtrack_module_methods = {
};
struct memtrack_module HAL_MODULE_INFO_SYM = {
- common: {
- tag: HARDWARE_MODULE_TAG,
- module_api_version: MEMTRACK_MODULE_API_VERSION_0_1,
- hal_api_version: HARDWARE_HAL_API_VERSION,
- id: MEMTRACK_HARDWARE_MODULE_ID,
- name: "MSM Memory Tracker HAL",
- author: "The Android Open Source Project",
- methods: &memtrack_module_methods,
+ .common = {
+ .tag = HARDWARE_MODULE_TAG,
+ .module_api_version = MEMTRACK_MODULE_API_VERSION_0_1,
+ .hal_api_version = HARDWARE_HAL_API_VERSION,
+ .id = MEMTRACK_HARDWARE_MODULE_ID,
+ .name = "MSM Memory Tracker HAL",
+ .author = "The Android Open Source Project",
+ .methods = &memtrack_module_methods,
},
- init: msm_memtrack_init,
- getMemory: msm_memtrack_get_memory,
+ .init = msm_memtrack_init,
+ .getMemory = msm_memtrack_get_memory,
};