drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AAPT2: Fix file::mkdirs when given absolute paths

Browse Source 
file::mkdirs would try to extract the first part of the
path '/path' which would be the empty string ''. Mkdir would
fail creating the empty string directory.

Change-Id: Ice8ba92135f145f52f3663499a2c49eebe797328
This commit is contained in:
Adam Lesinski
2016-03-09 13:11:25 -08:00
parent 0dda14c671
commit 96917c25f0
6 changed files with 105 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
tools/aapt2/link/Link.cpp
View File

@ -729,12 +729,18 @@ public:
std::string outPath = mOptions.generateJavaClassPath.value();
file::appendPath(&outPath, file::packageToPath(util::utf16ToUtf8(outPackage)));
file::mkdirs(outPath);
if (!file::mkdirs(outPath)) {
mContext->getDiagnostics()->error(
DiagMessage() << "failed to create directory '" << outPath << "'");
return false;
}
file::appendPath(&outPath, "R.java");
std::ofstream fout(outPath, std::ofstream::binary);
if (!fout) {
mContext->getDiagnostics()->error(DiagMessage() << strerror(errno));
mContext->getDiagnostics()->error(
DiagMessage() << "failed writing to '" << outPath << "': " << strerror(errno));
return false;
}
@ -743,6 +749,11 @@ public:
mContext->getDiagnostics()->error(DiagMessage(outPath) << generator.getError());
return false;
}
if (!fout) {
mContext->getDiagnostics()->error(
DiagMessage() << "failed writing to '" << outPath << "': " << strerror(errno));
}
return true;
}
@ -754,12 +765,18 @@ public:
std::string outPath = mOptions.generateJavaClassPath.value();
file::appendPath(&outPath,
file::packageToPath(util::utf16ToUtf8(mContext->getCompilationPackage())));
file::mkdirs(outPath);
if (!file::mkdirs(outPath)) {
mContext->getDiagnostics()->error(
DiagMessage() << "failed to create directory '" << outPath << "'");
return false;
}
file::appendPath(&outPath, "Manifest.java");
std::ofstream fout(outPath, std::ofstream::binary);
if (!fout) {
mContext->getDiagnostics()->error(DiagMessage() << strerror(errno));
mContext->getDiagnostics()->error(
DiagMessage() << "failed writing to '" << outPath << "': " << strerror(errno));
return false;
}
@ -770,7 +787,8 @@ public:
}
if (!fout) {
mContext->getDiagnostics()->error(DiagMessage() << strerror(errno));
mContext->getDiagnostics()->error(
DiagMessage() << "failed writing to '" << outPath << "': " << strerror(errno));
return false;
}
return true;
@ -781,15 +799,18 @@ public:
return true;
}
std::ofstream fout(mOptions.generateProguardRulesPath.value(), std::ofstream::binary);
const std::string& outPath = mOptions.generateProguardRulesPath.value();
std::ofstream fout(outPath, std::ofstream::binary);
if (!fout) {
mContext->getDiagnostics()->error(DiagMessage() << strerror(errno));
mContext->getDiagnostics()->error(
DiagMessage() << "failed to open '" << outPath << "': " << strerror(errno));
return false;
}
proguard::writeKeepSet(&fout, keepSet);
if (!fout) {
mContext->getDiagnostics()->error(DiagMessage() << strerror(errno));
mContext->getDiagnostics()->error(
DiagMessage() << "failed writing to '" << outPath << "': " << strerror(errno));
return false;
}
return true;