Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ed77c13 authored by Mark Salyzyn's avatar Mark Salyzyn Committed by Android Git Automerger
Browse files

am 2d0e8d8f: Merge "libcpustats: Turn on -Werror" 

* commit '2d0e8d8f':
  libcpustats: Turn on -Werror
parents 215f7b91 2d0e8d8f

media/libcpustats/Android.mk

+3 −1
Original line number Diff line number Diff line
@@ -8,4 +8,6 @@ LOCAL_SRC_FILES := \ 


LOCAL_MODULE := libcpustats



LOCAL_CFLAGS := -std=gnu++11 -Werror



include $(BUILD_STATIC_LIBRARY)

media/libcpustats/ThreadCpuUsage.cpp

+1 −2
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#include <stdlib.h>

#include <time.h>



#include <utils/Debug.h>

#include <utils/Log.h>



#include <cpustats/ThreadCpuUsage.h>
@@ -218,7 +217,7 @@ uint32_t ThreadCpuUsage::getCpukHz(int cpuNum) 
#define FREQ_SIZE 64

            char freq_path[FREQ_SIZE];

#define FREQ_DIGIT 27

            COMPILE_TIME_ASSERT_FUNCTION_SCOPE(MAX_CPU <= 10);

            static_assert(MAX_CPU <= 10, "MAX_CPU too large");

#define FREQ_PATH "/sys/devices/system/cpu/cpu?/cpufreq/scaling_cur_freq"

            strlcpy(freq_path, FREQ_PATH, sizeof(freq_path));

            freq_path[FREQ_DIGIT] = cpuNum + '0';