summaryrefslogtreecommitdiff
path: root/tools/aapt2/optimize/MultiApkGenerator_test.cpp
diff options
context:
space:
mode:
authorCory Smith <corysmith@google.com>2018-03-18 23:29:45 +0000
committerandroid-build-merger <android-build-merger@google.com>2018-03-18 23:29:45 +0000
commit34b10c529a1b90ef2a4e56f3ebf611c6aa41582f (patch)
tree8b0da7c1cd9b2484a83250b3081586453e589a48 /tools/aapt2/optimize/MultiApkGenerator_test.cpp
parentd1457eea49a423d21fe398d921c216d039fd4ec4 (diff)
parent6a43bd634edce1e56c9f2193fd0fe3910eb1f03a (diff)
Merge "Writes the resource table proto out when writing a LoadedApk." into pi-dev am: 449be81065
am: 6a43bd634e Change-Id: I3e84028a1e74b28d2804d66971cf4610874ae349
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;