Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "AAPT2: Reorder link steps"

Browse Source
This commit is contained in:
Alexandria Cornwall
2016-08-11 18:33:01 +00:00
committed by Android (Google) Code Review
parent ed45cf3c47 637b4820dc
commit 8eefa04826
1 changed files with 23 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1191,6 +1191,12 @@ public:
mContext->getDiagnostics())) {
AppInfo& appInfo = maybeAppInfo.value();
mContext->setCompilationPackage(appInfo.package);
if (appInfo.minSdkVersion) {
if (Maybe<int> maybeMinSdkVersion =
ResourceUtils::tryParseSdkVersion(appInfo.minSdkVersion.value())) {
mContext->setMinSdkVersion(maybeMinSdkVersion.value());
}
}
} else {
return 1;
}
@@ -1393,32 +1399,6 @@ public:
return 1;
}
// Must come before ResourceFileFlattener as ResourceFileFlattener
// relies on the minSdkVersion to properly flatten files.
Maybe<AppInfo> maybeAppInfo = extractAppInfoFromManifest(manifestXml.get(),
mContext->getDiagnostics());
if (maybeAppInfo && maybeAppInfo.value().minSdkVersion) {
if (Maybe<int> maybeMinSdkVersion =
ResourceUtils::tryParseSdkVersion(maybeAppInfo.value().minSdkVersion.value())) {
mContext->setMinSdkVersion(maybeMinSdkVersion.value());
}
}
ResourceFileFlattenerOptions fileFlattenerOptions;
fileFlattenerOptions.keepRawValues = mOptions.staticLib;
fileFlattenerOptions.doNotCompressAnything = mOptions.doNotCompressAnything;
fileFlattenerOptions.extensionsToNotCompress = mOptions.extensionsToNotCompress;
fileFlattenerOptions.noAutoVersion = mOptions.noAutoVersion;
fileFlattenerOptions.noVersionVectors = mOptions.noVersionVectors;
fileFlattenerOptions.updateProguardSpec =
static_cast<bool>(mOptions.generateProguardRulesPath);
ResourceFileFlattener fileFlattener(fileFlattenerOptions, mContext, &proguardKeepSet);
if (!fileFlattener.flatten(&mFinalTable, archiveWriter.get())) {
mContext->getDiagnostics()->error(DiagMessage() << "failed linking file resources");
return 1;
}
if (!mOptions.noAutoVersion) {
AutoVersioner versioner;
if (!versioner.consume(mContext, &mFinalTable)) {
@@ -1440,6 +1420,23 @@ public:
}
}
// Write out the table to an archive. Optimizations to the table should come before this
// step.
ResourceFileFlattenerOptions fileFlattenerOptions;
fileFlattenerOptions.keepRawValues = mOptions.staticLib;
fileFlattenerOptions.doNotCompressAnything = mOptions.doNotCompressAnything;
fileFlattenerOptions.extensionsToNotCompress = mOptions.extensionsToNotCompress;
fileFlattenerOptions.noAutoVersion = mOptions.noAutoVersion;
fileFlattenerOptions.noVersionVectors = mOptions.noVersionVectors;
fileFlattenerOptions.updateProguardSpec =
static_cast<bool>(mOptions.generateProguardRulesPath);
ResourceFileFlattener fileFlattener(fileFlattenerOptions, mContext, &proguardKeepSet);
if (!fileFlattener.flatten(&mFinalTable, archiveWriter.get())) {
mContext->getDiagnostics()->error(DiagMessage() << "failed linking file resources");
return 1;
}
if (mOptions.staticLib) {
if (!flattenTableToPb(&mFinalTable, archiveWriter.get())) {
mContext->getDiagnostics()->error(DiagMessage()