Loading in an APk changed the ordering of strings in the string pool. When loading an apk, assign the strings to the same index as they are in the ResStringPool. Bug: 118831219 Test: "aapt2 dump strings left.apk" prints in the correct order, "aapt2 convert left.apk --output-format binary -o left_binary.apk" has entries in the correct order, and aapt2_tests Change-Id: I00014c02195f39c1152a110e90083d9b14e9216e
59 lines
2.0 KiB
C++
59 lines
2.0 KiB
C++
/*
|
|
* Copyright (C) 2018 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#ifndef AAPT2_CONVERT_H
|
|
#define AAPT2_CONVERT_H
|
|
|
|
#include "Command.h"
|
|
#include "LoadedApk.h"
|
|
#include "format/binary/TableFlattener.h"
|
|
|
|
namespace aapt {
|
|
|
|
class ConvertCommand : public Command {
|
|
public:
|
|
explicit ConvertCommand() : Command("convert") {
|
|
SetDescription("Converts an apk between binary and proto formats.");
|
|
AddRequiredFlag("-o", "Output path", &output_path_);
|
|
AddOptionalFlag("--output-format", android::base::StringPrintf("Format of the output. "
|
|
"Accepted values are '%s' and '%s'. When not set, defaults to '%s'.",
|
|
kOutputFormatProto, kOutputFormatBinary, kOutputFormatBinary), &output_format_);
|
|
AddOptionalSwitch("--enable-sparse-encoding",
|
|
"Enables encoding sparse entries using a binary search tree.\n"
|
|
"This decreases APK size at the cost of resource retrieval performance.",
|
|
&options_.use_sparse_entries);
|
|
AddOptionalSwitch("-v", "Enables verbose logging", &verbose_);
|
|
}
|
|
|
|
int Action(const std::vector<std::string>& args) override;
|
|
|
|
private:
|
|
const static char* kOutputFormatProto;
|
|
const static char* kOutputFormatBinary;
|
|
|
|
TableFlattenerOptions options_;
|
|
std::string output_path_;
|
|
Maybe<std::string> output_format_;
|
|
bool verbose_ = false;
|
|
};
|
|
|
|
int Convert(IAaptContext* context, LoadedApk* input, IArchiveWriter* output_writer,
|
|
ApkFormat output_format, TableFlattenerOptions& options);
|
|
|
|
} // namespace aapt
|
|
|
|
#endif //AAPT2_CONVERT_H
|