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

Commit f1ff21ac authored by Steve Block's avatar Steve Block
Browse files

Fixes a few minor problems with AAPT 

- Fixes casting problems with stricter compilers
- Adds a couple of missing ifdef guards

This is a first step toward being able to generate APKs on the fly on the device.

Bug: 2766918
Change-Id: Icaaee5a4032afa313256add321b447443861dd85
parent b5c49c8b

tools/aapt/Command.cpp

+4 −1
Original line number Diff line number Diff line
@@ -197,8 +197,10 @@ int doList(Bundle* bundle) 
        if (&res == NULL) {

            printf("\nNo resource table found.\n");

        } else {

#ifndef HAVE_ANDROID_OS

            printf("\nResource table:\n");

            res.print(false);

#endif

        }



        Asset* manifestAsset = assets.openNonAsset("AndroidManifest.xml",
@@ -388,8 +390,9 @@ int doDump(Bundle* bundle) 
    }



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

#ifndef HAVE_ANDROID_OS

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



#endif

    } else if (strcmp("xmltree", option) == 0) {

        if (bundle->getFileSpecCount() < 3) {

            fprintf(stderr, "ERROR: no dump xmltree resource file specified\n");

tools/aapt/Package.cpp

+1 −1
Original line number Diff line number Diff line
@@ -441,7 +441,7 @@ ssize_t processJarFile(ZipFile* jar, ZipFile* out) 


ssize_t processJarFiles(Bundle* bundle, ZipFile* zip)

{

    ssize_t err;

    status_t err;

    ssize_t count = 0;

    const android::Vector<const char*>& jars = bundle->getJarFiles();

tools/aapt/Resource.cpp

+3 −3
Original line number Diff line number Diff line
@@ -542,11 +542,11 @@ static bool applyFileOverlay(Bundle *bundle, 
                        DefaultKeyedVector<AaptGroupEntry, sp<AaptFile> > baseFiles =

                                baseGroup->getFiles();

                        for (size_t i=0; i < baseFiles.size(); i++) {

                            printf("baseFile %ld has flavor %s\n", i,

                            printf("baseFile %d has flavor %s\n", i,

                                    baseFiles.keyAt(i).toString().string());

                        }

                        for (size_t i=0; i < overlayFiles.size(); i++) {

                            printf("overlayFile %ld has flavor %s\n", i,

                            printf("overlayFile %d has flavor %s\n", i,

                                    overlayFiles.keyAt(i).toString().string());

                        }

                    }
@@ -560,7 +560,7 @@ static bool applyFileOverlay(Bundle *bundle, 
                                keyAt(overlayGroupIndex));

                        if(baseFileIndex < UNKNOWN_ERROR) {

                            if (bundle->getVerbose()) {

                                printf("found a match (%ld) for overlay file %s, for flavor %s\n",

                                printf("found a match (%d) for overlay file %s, for flavor %s\n",

                                        baseFileIndex,

                                        overlayGroup->getLeaf().string(),

                                        overlayFiles.keyAt(overlayGroupIndex).toString().string());

tools/aapt/ResourceTable.cpp

+1 −1
Original line number Diff line number Diff line
@@ -2366,7 +2366,7 @@ ResourceTable::validateLocalizations(void) 
        if (configSet.count(defaultLocale) == 0) {

            fprintf(stdout, "aapt: warning: string '%s' has no default translation in %s; found:",

                    String8(nameIter->first).string(), mBundle->getResourceSourceDirs()[0]);

            for (set<String8>::iterator locales = configSet.begin();

            for (set<String8>::const_iterator locales = configSet.begin();

                 locales != configSet.end();

                 locales++) {

                fprintf(stdout, " %s", (*locales).string());

tools/aapt/StringPool.cpp

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ void printStringPool(const ResStringPool* pool) 
            str = String8(pool->stringAt(s, &len)).string();

        }



        printf("String #%ld: %s\n", s, str);

        printf("String #%d: %s\n", s, str);

    }

}