diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2017-10-31 17:44:39 -0700 |
|---|---|---|
| committer | Adam Lesinski <adamlesinski@google.com> | 2017-11-01 10:58:28 -0700 |
| commit | 8780eb6e4918ae24fb1ae74d631042c32e41dc3d (patch) | |
| tree | 938e18951a562fcd043ac779c7e758444b4bf0a8 /tools/aapt2/optimize/MultiApkGenerator_test.cpp | |
| parent | 4f340a4f8b50b29b562407e39563ee78a90bea3f (diff) | |
AAPT2: Add convert command
This command allows a developer to convert their proto APK
(generated from the link phase using --proto-format) into
a binary APK suitable for use on device.
aapt2 convert -o output.apk input.apk
Test: manual + make aapt2_tests
Change-Id: I10a7c33bb4b57006d01fe00a8bf92f78e04e7e50
Diffstat (limited to 'tools/aapt2/optimize/MultiApkGenerator_test.cpp')
| -rw-r--r-- | tools/aapt2/optimize/MultiApkGenerator_test.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/aapt2/optimize/MultiApkGenerator_test.cpp b/tools/aapt2/optimize/MultiApkGenerator_test.cpp index c8f3524748b6..30c9146b5444 100644 --- a/tools/aapt2/optimize/MultiApkGenerator_test.cpp +++ b/tools/aapt2/optimize/MultiApkGenerator_test.cpp @@ -106,7 +106,7 @@ class MultiApkGeneratorTest : public ::testing::Test { TEST_F(MultiApkGeneratorTest, VersionFilterNewerVersion) { std::unique_ptr<ResourceTable> table = BuildTable(); - LoadedApk apk = {{"test.apk"}, {}, std::move(table)}; + LoadedApk apk = {{"test.apk"}, {}, std::move(table), {}}; std::unique_ptr<IAaptContext> ctx = test::ContextBuilder().SetMinSdkVersion(19).Build(); PostProcessingConfiguration empty_config; TableFlattenerOptions table_flattener_options; @@ -147,7 +147,7 @@ TEST_F(MultiApkGeneratorTest, VersionFilterNewerVersion) { TEST_F(MultiApkGeneratorTest, VersionFilterOlderVersion) { std::unique_ptr<ResourceTable> table = BuildTable(); - LoadedApk apk = {{"test.apk"}, {}, std::move(table)}; + LoadedApk apk = {{"test.apk"}, {}, std::move(table), {}}; std::unique_ptr<IAaptContext> ctx = test::ContextBuilder().SetMinSdkVersion(1).Build(); PostProcessingConfiguration empty_config; TableFlattenerOptions table_flattener_options; @@ -186,7 +186,7 @@ TEST_F(MultiApkGeneratorTest, VersionFilterOlderVersion) { TEST_F(MultiApkGeneratorTest, VersionFilterNoVersion) { std::unique_ptr<ResourceTable> table = BuildTable(); - LoadedApk apk = {{"test.apk"}, {}, std::move(table)}; + LoadedApk apk = {{"test.apk"}, {}, std::move(table), {}}; std::unique_ptr<IAaptContext> ctx = test::ContextBuilder().SetMinSdkVersion(1).Build(); PostProcessingConfiguration empty_config; TableFlattenerOptions table_flattener_options; |