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

Merge "AAPT2: Add option to disable PNG crunching" into oc-dev

Browse Source
This commit is contained in:
Adam Lesinski
2017-05-11 18:39:00 +00:00
committed by Android (Google) Code Review
parent 33644ff3f9 28e6c0bac2
commit fb194bb81c
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/aapt2/Main.cpp
View File

@@ -27,7 +27,7 @@ namespace aapt {
static const char* sMajorVersion = "2"; static const char* sMajorVersion = "2";
// Update minor version whenever a feature or flag is added. // Update minor version whenever a feature or flag is added.
static const char* sMinorVersion = "14"; static const char* sMinorVersion = "15";
int PrintVersion() { int PrintVersion() {
std::cerr << "Android Asset Packaging Tool (aapt) " << sMajorVersion << "." std::cerr << "Android Asset Packaging Tool (aapt) " << sMajorVersion << "."

5
tools/aapt2/cmd/Compile.cpp
View File

@@ -114,6 +114,7 @@ struct CompileOptions {
std::string output_path; std::string output_path;
Maybe<std::string> res_dir; Maybe<std::string> res_dir;
bool pseudolocalize = false; bool pseudolocalize = false;
bool no_png_crunch = false;
bool legacy_mode = false; bool legacy_mode = false;
bool verbose = false; bool verbose = false;
}; };
@@ -663,6 +664,7 @@ int Compile(const std::vector<StringPiece>& args, IDiagnostics* diagnostics) {
"Generate resources for pseudo-locales " "Generate resources for pseudo-locales "
"(en-XA and ar-XB)", "(en-XA and ar-XB)",
&options.pseudolocalize) &options.pseudolocalize)
.OptionalSwitch("--no-crunch", "Disables PNG processing", &options.no_png_crunch)
.OptionalSwitch("--legacy", "Treat errors that used to be valid in AAPT as warnings", .OptionalSwitch("--legacy", "Treat errors that used to be valid in AAPT as warnings",
&options.legacy_mode) &options.legacy_mode)
.OptionalSwitch("-v", "Enables verbose logging", &verbose); .OptionalSwitch("-v", "Enables verbose logging", &verbose);
@@ -738,7 +740,8 @@ int Compile(const std::vector<StringPiece>& args, IDiagnostics* diagnostics) {
if (!CompileXml(&context, options, path_data, archive_writer.get(), output_filename)) { if (!CompileXml(&context, options, path_data, archive_writer.get(), output_filename)) {
error = true; error = true;
} }
} else if (path_data.extension == "png" || path_data.extension == "9.png") { } else if (!options.no_png_crunch &&
(path_data.extension == "png" || path_data.extension == "9.png")) {
if (!CompilePng(&context, options, path_data, archive_writer.get(), output_filename)) { if (!CompilePng(&context, options, path_data, archive_writer.get(), output_filename)) {
error = true; error = true;
} }

8
tools/aapt2/readme.md
View File

@@ -1,5 +1,13 @@
# Android Asset Packaging Tool 2.0 (AAPT2) release notes # Android Asset Packaging Tool 2.0 (AAPT2) release notes
## Version 2.15
### `aapt2 compile ...`
- Add `--no-crunch` option to avoid processing PNGs during the compile phase. Note that this
shouldn't be used as a performance optimization, as once the PNG is processed, its result is
cached for incremental linking. This should only be used if the developer has specially
pre-processed the PNG and wants it byte-for-byte identical to the input.
NOTE: 9-patches will not be processed correctly with this flag set.
## Version 2.14 ## Version 2.14
### `aapt2 link ...` ### `aapt2 link ...`
- If an app is building with a minSdkVersion < 26 and a --package-id XX where XX > 7F, aapt2 - If an app is building with a minSdkVersion < 26 and a --package-id XX where XX > 7F, aapt2