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

Commit 344d347a authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am 39669d7f: am 6fdc6333: Merge "Lose HAVE_ANDROID_OS from frameworks/base." 

* commit '39669d7f':
  Lose HAVE_ANDROID_OS from frameworks/base.
parents d202d15d 39669d7f

libs/androidfw/AssetManager.cpp

+4 −4
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
#include <utils/String8.h>

#include <utils/threads.h>

#include <utils/Timers.h>

#ifdef HAVE_ANDROID_OS

#ifdef __ANDROID__

#include <cutils/trace.h>

#endif
@@ -54,7 +54,7 @@ 
    _rc; })

#endif



#ifdef HAVE_ANDROID_OS

#ifdef __ANDROID__

#define MY_TRACE_BEGIN(x) ATRACE_BEGIN(x)

#define MY_TRACE_END() ATRACE_END()

#else
@@ -229,7 +229,7 @@ bool AssetManager::addAssetPath(const String8& path, int32_t* cookie) 
        *cookie = static_cast<int32_t>(mAssetPaths.size());

    }



#ifdef HAVE_ANDROID_OS

#ifdef __ANDROID__

    // Load overlays, if any

    asset_path oap;

    for (size_t idx = 0; mZipSet.getOverlay(ap.path, idx, &oap); idx++) {
@@ -657,7 +657,7 @@ bool AssetManager::appendPathToResTable(const asset_path& ap) const { 
                ALOGV("Creating shared resources for %s", ap.path.string());

                sharedRes = new ResTable();

                sharedRes->add(ass, idmap, nextEntryIdx + 1, false);

#ifdef HAVE_ANDROID_OS

#ifdef __ANDROID__

                const char* data = getenv("ANDROID_DATA");

                LOG_ALWAYS_FATAL_IF(data == NULL, "ANDROID_DATA not set");

                String8 overlaysListPath(data);

libs/androidfw/ResourceTypes.cpp

+1 −1
Original line number Diff line number Diff line
@@ -727,7 +727,7 @@ const char16_t* ResStringPool::stringAt(size_t idx, size_t* u16len) const 
                    AutoMutex lock(mDecodeLock);



                    if (mCache == NULL) {

#ifndef HAVE_ANDROID_OS

#ifndef __ANDROID__

                        if (kDebugStringPoolNoisy) {

                            ALOGI("CREATING STRING CACHE OF %zu bytes",

                                    mHeader->stringCount*sizeof(char16_t**));

tools/aapt/Command.cpp

+2 −2
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ int doList(Bundle* bundle) 
            goto bail;

        }



#ifdef HAVE_ANDROID_OS

#ifdef __ANDROID__

        static const bool kHaveAndroidOs = true;

#else

        static const bool kHaveAndroidOs = false;
@@ -633,7 +633,7 @@ int doDump(Bundle* bundle) 
    Asset* asset = NULL;



    if (strcmp("resources", option) == 0) {

#ifndef HAVE_ANDROID_OS

#ifndef __ANDROID__

        res.print(bundle->getValues());

#endif