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

Commit 815862f8 authored by Adam Lesinski's avatar Adam Lesinski Committed by Android Git Automerger
Browse files

am 10db7553: am dd64fc43: am effd416e: am 83fae208: am 3cd840f4: Merge "AAPT:... 

am 10db7553: am dd64fc43: am effd416e: am 83fae208: am 3cd840f4: Merge "AAPT: Fix an issue where a resource name was incorrectly derived on Windows" into lmp-dev

* commit '10db7553':
  AAPT: Fix an issue where a resource name was incorrectly derived on Windows
parents ef0b5f56 10db7553

tools/aapt/Images.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1505,7 +1505,7 @@ status_t postProcessImage(const Bundle* bundle, const sp<AaptAssets>& assets, 
    // At this point, now that we have all the resource data, all we need to

    // do is compile XML files.

    if (strcmp(ext.string(), ".xml") == 0) {

        String16 resourceName(parseResourceName(file->getPath().getPathLeaf()));

        String16 resourceName(parseResourceName(file->getSourceFile().getPathLeaf()));

        return compileXmlFile(bundle, assets, resourceName, file, table);

    }