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

Commit a64e7575 authored by Mark Salyzyn's avatar Mark Salyzyn Committed by android-build-merger
Browse files

Merge "dumpstate: Continued build breakage" am: 16072e7e 

am: c01e8dc4

* commit 'c01e8dc4':
  dumpstate: Continued build breakage
parents 8bdefd0b c01e8dc4

cmds/dumpstate/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ LOCAL_SHARED_LIBRARIES := libcutils liblog libselinux 
# ZipArchive support, the order matters here to get all symbols.

LOCAL_STATIC_LIBRARIES := libziparchive libz libbase libmincrypt

LOCAL_HAL_STATIC_LIBRARIES := libdumpstate

LOCAL_CFLAGS += -Wall -Werror -Wno-unused-parameter -std=gnu99

LOCAL_CFLAGS += -Wall -Werror -Wno-unused-parameter

LOCAL_INIT_RC := dumpstate.rc



include $(BUILD_EXECUTABLE)

cmds/dumpstate/utils.cpp

+4 −4
Original line number Diff line number Diff line
@@ -324,10 +324,10 @@ void show_showtime(int pid, const char *name) { 
    // field 42 is iotime

    unsigned long long utime = 0, stime = 0, iotime = 0;

    if (sscanf(buffer,

               "%*llu %*s %*s %*lld %*lld %*lld %*lld %*lld %*lld %*lld %*lld "

               "%*lld %*lld %llu %llu %*lld %*lld %*lld %*lld %*lld %*lld "

               "%*lld %*lld %*lld %*lld %*lld %*lld %*lld %*lld %*lld %*lld "

               "%*lld %*lld %*lld %*lld %*lld %*lld %*lld %*lld %*lld %llu ",

               "%*u %*s %*s %*d %*d %*d %*d %*d %*d %*d %*d "

               "%*d %*d %llu %llu %*d %*d %*d %*d %*d %*d "

               "%*d %*d %*d %*d %*d %*d %*d %*d %*d %*d "

               "%*d %*d %*d %*d %*d %*d %*d %*d %*d %llu ",

               &utime, &stime, &iotime) != 3) {

        return;

    }