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

Commit 84d4917c authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am 12cf0f9c: am eba23aaa: Merge "Replace HAVE_MS_C_RUNTIME with _WIN32 in frameworks/base/tools." 

* commit '12cf0f9c':
  Replace HAVE_MS_C_RUNTIME with _WIN32 in frameworks/base/tools.
parents cd3f8753 12cf0f9c

tools/aapt/CacheUpdater.h

+2 −2
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
#include <sys/stat.h>

#include <stdio.h>

#include "Images.h"

#ifdef HAVE_MS_C_RUNTIME

#ifdef _WIN32

#include <direct.h>

#endif
@@ -81,7 +81,7 @@ public: 
                // Advance to the next segment of the path

                existsPath.appendPath(toCreate.walkPath(&remains));

                toCreate = remains;

#ifdef HAVE_MS_C_RUNTIME

#ifdef _WIN32

                _mkdir(existsPath.string());

#else

                mkdir(existsPath.string(), S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP);

tools/aapt/Resource.cpp

+1 −1
Original line number Diff line number Diff line
@@ -2682,7 +2682,7 @@ status_t writeResourceSymbols(Bundle* bundle, const sp<AaptAssets>& assets, 
                if (s > last && (*s == '.' || *s == 0)) {

                    String8 part(last, s-last);

                    dest.appendPath(part);

#ifdef HAVE_MS_C_RUNTIME

#ifdef _WIN32

                    _mkdir(dest.string());

#else

                    mkdir(dest.string(), S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP);

tools/aapt/XMLNode.cpp

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
#include <errno.h>

#include <string.h>



#ifndef HAVE_MS_C_RUNTIME

#ifndef _WIN32

#define O_BINARY 0

#endif

tools/aidl/aidl.cpp

+3 −3
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#include <string.h>

#include <map>



#ifdef HAVE_MS_C_RUNTIME

#ifdef _WIN32

#include <io.h>

#include <direct.h>

#include <sys/stat.h>
@@ -754,7 +754,7 @@ check_outputFilePath(const string& path) { 
        if (path[i] == OS_PATH_SEPARATOR) {

            string p = path.substr(0, i);

            if (access(path.data(), F_OK) != 0) {

#ifdef HAVE_MS_C_RUNTIME

#ifdef _WIN32

                _mkdir(p.data());

#else

                mkdir(p.data(), S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP);
@@ -1113,7 +1113,7 @@ preprocess_aidl(const Options& options) 
    // write preprocessed file

    int fd = open( options.outputFileName.c_str(), 

                   O_RDWR|O_CREAT|O_TRUNC|O_BINARY,

#ifdef HAVE_MS_C_RUNTIME

#ifdef _WIN32

                   _S_IREAD|_S_IWRITE);

#else    

                   S_IRUSR|S_IWUSR|S_IRGRP);

tools/aidl/aidl_language.cpp

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#include <string.h>

#include <stdlib.h>



#ifdef HAVE_MS_C_RUNTIME

#ifdef _WIN32

int isatty(int  fd)

{

    return (fd == 0);