summaryrefslogtreecommitdiff
path: root/tools/aapt2/optimize/MultiApkGenerator_test.cpp
diff options
context:
space:
mode:
authorCory Smith <corysmith@google.com>2018-03-18 23:19:40 +0000
committerandroid-build-merger <android-build-merger@google.com>2018-03-18 23:19:40 +0000
commit6a43bd634edce1e56c9f2193fd0fe3910eb1f03a (patch)
tree2f1d8bc35d158d568b74973bf01493ac9ff968da /tools/aapt2/optimize/MultiApkGenerator_test.cpp
parent74d615f1acec2db8fd27f331d62cc89701b25741 (diff)
parent449be81065230b9b9ac3c86640356b6d49b9ada3 (diff)
Merge "Writes the resource table proto out when writing a LoadedApk." into pi-dev
am: 449be81065 Change-Id: If6e57967cc36a1c69c709a7aee60730aca967d2e
Diffstat (limited to 'tools/aapt2/optimize/MultiApkGenerator_test.cpp')
-rw-r--r--tools/aapt2/optimize/MultiApkGenerator_test.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/aapt2/optimize/MultiApkGenerator_test.cpp b/tools/aapt2/optimize/MultiApkGenerator_test.cpp
index e1d951fc9776..80eb737fa682 100644
--- a/tools/aapt2/optimize/MultiApkGenerator_test.cpp
+++ b/tools/aapt2/optimize/MultiApkGenerator_test.cpp
@@ -104,7 +104,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), {}, kBinary};
std::unique_ptr<IAaptContext> ctx = test::ContextBuilder().SetMinSdkVersion(19).Build();
FilterChain chain;
@@ -131,7 +131,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), {}, kBinary};
std::unique_ptr<IAaptContext> ctx = test::ContextBuilder().SetMinSdkVersion(1).Build();
FilterChain chain;
@@ -156,7 +156,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), {}, kBinary};
std::unique_ptr<IAaptContext> ctx = test::ContextBuilder().SetMinSdkVersion(1).Build();
FilterChain chain;