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

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

am d4dabf87: am cdbf28b3: Merge "native frameworks: 64-bit compile issues" 

* commit 'd4dabf87':
  native frameworks: 64-bit compile issues
parents 49bfda1f d4dabf87

cmds/atrace/atrace.cpp

+3 −2
Original line number Original line Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <errno.h>

#include <errno.h>

#include <fcntl.h>

#include <fcntl.h>

#include <getopt.h>

#include <getopt.h>

#include <inttypes.h>

#include <signal.h>

#include <signal.h>

#include <stdarg.h>

#include <stdarg.h>

#include <stdbool.h>

#include <stdbool.h>
@@ -368,7 +369,7 @@ static bool pokeBinderServices() 
static bool setTagsProperty(uint64_t tags)

static bool setTagsProperty(uint64_t tags)

{

{

    char buf[64];

    char buf[64];

    snprintf(buf, 64, "%#llx", tags);

    snprintf(buf, 64, "%#" PRIx64, tags);

    if (property_set(k_traceTagsProperty, buf) < 0) {

    if (property_set(k_traceTagsProperty, buf) < 0) {

        fprintf(stderr, "error setting trace tags system property\n");

        fprintf(stderr, "error setting trace tags system property\n");

        return false;

        return false;
@@ -665,7 +666,7 @@ static void dumpTrace() 
    close(traceFD);

    close(traceFD);

}

}





static void handleSignal(int signo)

static void handleSignal(int /*signo*/)

{

{

    if (!g_nohup) {

    if (!g_nohup) {

        g_traceAborted = true;

        g_traceAborted = true;

cmds/flatland/Composers.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -122,12 +122,12 @@ public: 
    virtual void tearDown() {

    virtual void tearDown() {

    }

    }





    virtual bool compose(GLuint texName, const sp<GLConsumer>& glc) {

    virtual bool compose(GLuint /*texName*/, const sp<GLConsumer>& /*glc*/) {

        return true;

        return true;

    }

    }





protected:

protected:

    virtual bool setUp(GLHelper* helper) {

    virtual bool setUp(GLHelper* /*helper*/) {

        return true;

        return true;

    }

    }

cmds/flatland/GLHelper.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -332,7 +332,7 @@ static bool compileShader(GLenum shaderType, const char* src, 




static void printShaderSource(const char* const* src) {

static void printShaderSource(const char* const* src) {

    for (size_t i = 0; i < MAX_SHADER_LINES && src[i] != NULL; i++) {

    for (size_t i = 0; i < MAX_SHADER_LINES && src[i] != NULL; i++) {

        fprintf(stderr, "%3d: %s\n", i+1, src[i]);

        fprintf(stderr, "%3zu: %s\n", i+1, src[i]);

    }

    }

}

}

cmds/flatland/Main.cpp

+4 −3
Original line number Original line Diff line number Diff line
@@ -600,7 +600,7 @@ static bool runTest(const BenchmarkDesc b, size_t run) { 




    uint32_t runHeight = b.runHeights[run];

    uint32_t runHeight = b.runHeights[run];

    uint32_t runWidth = b.width * runHeight / b.height;

    uint32_t runWidth = b.width * runHeight / b.height;

    printf(" %-*s | %4d x %4d | ", g_BenchmarkNameLen, b.name,

    printf(" %-*s | %4d x %4d | ", static_cast<int>(g_BenchmarkNameLen), b.name,

            runWidth, runHeight);

            runWidth, runHeight);

    fflush(stdout);

    fflush(stdout);
@@ -690,8 +690,9 @@ static void printResultsTableHeader() { 
    size_t len = strlen(scenario);

    size_t len = strlen(scenario);

    size_t leftPad = (g_BenchmarkNameLen - len) / 2;

    size_t leftPad = (g_BenchmarkNameLen - len) / 2;

    size_t rightPad = g_BenchmarkNameLen - len - leftPad;

    size_t rightPad = g_BenchmarkNameLen - len - leftPad;

    printf(" %*s%s%*s | Resolution  | Time (ms)\n", leftPad, "",

    printf(" %*s%s%*s | Resolution  | Time (ms)\n",

            "Scenario", rightPad, "");

            static_cast<int>(leftPad), "",

            "Scenario", static_cast<int>(rightPad), "");

}

}





// Run ALL the benchmarks!

// Run ALL the benchmarks!

cmds/installd/commands.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -14,6 +14,7 @@ 
** limitations under the License.

** limitations under the License.

*/

*/





#include <inttypes.h>

#include <sys/capability.h>

#include <sys/capability.h>

#include "installd.h"

#include "installd.h"

#include <diskusage/dirsize.h>

#include <diskusage/dirsize.h>
@@ -157,7 +158,7 @@ int fix_uid(const char *pkgname, uid_t uid, gid_t gid) 
    if (stat(pkgdir, &s) < 0) return -1;

    if (stat(pkgdir, &s) < 0) return -1;





    if (s.st_uid != 0 || s.st_gid != 0) {

    if (s.st_uid != 0 || s.st_gid != 0) {

        ALOGE("fixing uid of non-root pkg: %s %lu %lu\n", pkgdir, s.st_uid, s.st_gid);

        ALOGE("fixing uid of non-root pkg: %s %" PRIu32 " %" PRIu32 "\n", pkgdir, s.st_uid, s.st_gid);

        return -1;

        return -1;

    }

    }