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

Commit 17bd236b authored by Chih-hung Hsieh's avatar Chih-hung Hsieh Committed by Gerrit Code Review
Browse files

Merge "Fix clang-tidy warnings in aapt and aapt2."

parents 76ce8e52 8bd37ba4

tools/aapt/ApkBuilder.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -32,7 +32,7 @@ class AaptFile; 




class ApkBuilder : public android::RefBase {

class ApkBuilder : public android::RefBase {

public:

public:

    ApkBuilder(const sp<WeakResourceFilter>& configFilter);

    explicit ApkBuilder(const sp<WeakResourceFilter>& configFilter);





    /**

    /**

     * Tells the builder to generate a separate APK for resources that

     * Tells the builder to generate a separate APK for resources that

tools/aapt/CacheUpdater.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -51,7 +51,7 @@ private: 
class SystemCacheUpdater : public CacheUpdater {

class SystemCacheUpdater : public CacheUpdater {

public:

public:

    // Constructor to set bundle to pass to preProcessImage

    // Constructor to set bundle to pass to preProcessImage

    SystemCacheUpdater (Bundle* b)

    explicit SystemCacheUpdater (Bundle* b)

        : bundle(b) { };

        : bundle(b) { };





    // Make sure all the directories along this path exist

    // Make sure all the directories along this path exist

tools/aapt/Command.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -248,7 +248,7 @@ bail: 
}

}





static void printResolvedResourceAttribute(const ResTable& resTable, const ResXMLTree& tree,

static void printResolvedResourceAttribute(const ResTable& resTable, const ResXMLTree& tree,

        uint32_t attrRes, String8 attrLabel, String8* outError)

        uint32_t attrRes, const String8& attrLabel, String8* outError)

{

{

    Res_value value;

    Res_value value;

    AaptXml::getResolvedResourceAttribute(resTable, tree, attrRes, &value, outError);

    AaptXml::getResolvedResourceAttribute(resTable, tree, attrRes, &value, outError);
@@ -399,7 +399,7 @@ static void printUsesImpliedPermission(const String8& name, const String8& reaso 
            ResTable::normalizeForOutput(reason.string()).string());

            ResTable::normalizeForOutput(reason.string()).string());

}

}





Vector<String8> getNfcAidCategories(AssetManager& assets, String8 xmlPath, bool offHost,

Vector<String8> getNfcAidCategories(AssetManager& assets, const String8& xmlPath, bool offHost,

        String8 *outError = NULL)

        String8 *outError = NULL)

{

{

    Asset* aidAsset = assets.openNonAsset(xmlPath, Asset::ACCESS_BUFFER);

    Asset* aidAsset = assets.openNonAsset(xmlPath, Asset::ACCESS_BUFFER);

tools/aapt/ConfigDescription.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -29,7 +29,7 @@ struct ConfigDescription : public android::ResTable_config { 
        size = sizeof(android::ResTable_config);

        size = sizeof(android::ResTable_config);

    }

    }





    ConfigDescription(const android::ResTable_config&o) {

    ConfigDescription(const android::ResTable_config&o) {  // NOLINT(implicit)

        *static_cast<android::ResTable_config*>(this) = o;

        *static_cast<android::ResTable_config*>(this) = o;

        size = sizeof(android::ResTable_config);

        size = sizeof(android::ResTable_config);

    }

    }

tools/aapt/CrunchCache.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -94,7 +94,7 @@ void CrunchCache::loadFiles() 
    delete dw;

    delete dw;

}

}





bool CrunchCache::needsUpdating(String8 relativePath) const

bool CrunchCache::needsUpdating(const String8& relativePath) const

{

{

    // Retrieve modification dates for this file entry under the source and

    // Retrieve modification dates for this file entry under the source and

    // cache directory trees. The vectors will return a modification date of 0

    // cache directory trees. The vectors will return a modification date of 0