From 07e272d2e47dddc7e3ba47770dc1230caeeb81fb Mon Sep 17 00:00:00 2001 From: Brandon Liu Date: Tue, 11 Oct 2022 21:26:24 +0000 Subject: [PATCH] Sparse encoding fully drop config.sdkVersion check Bug: 197642721 Test: Updated and verified affected atests pass Change-Id: I0e5b7086e665340cd2995c11af8b901de85d321f --- tools/aapt2/format/binary/TableFlattener.cpp | 3 +-- tools/aapt2/format/binary/TableFlattener_test.cpp | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/aapt2/format/binary/TableFlattener.cpp b/tools/aapt2/format/binary/TableFlattener.cpp index 7dc9d26f91083..318b8b6dcd318 100644 --- a/tools/aapt2/format/binary/TableFlattener.cpp +++ b/tools/aapt2/format/binary/TableFlattener.cpp @@ -173,8 +173,7 @@ class PackageFlattener { // Sparse encode if forced or sdk version is not set in context and config. } else { // Otherwise, only sparse encode if the entries will be read on platforms S_V2+. - sparse_encode = sparse_encode && - (context_->GetMinSdkVersion() >= SDK_S_V2 || config.sdkVersion >= SDK_S_V2); + sparse_encode = sparse_encode && (context_->GetMinSdkVersion() >= SDK_S_V2); } // Only sparse encode if the offsets are representable in 2 bytes. diff --git a/tools/aapt2/format/binary/TableFlattener_test.cpp b/tools/aapt2/format/binary/TableFlattener_test.cpp index 2097a6372adbb..d08b4a3e5deb5 100644 --- a/tools/aapt2/format/binary/TableFlattener_test.cpp +++ b/tools/aapt2/format/binary/TableFlattener_test.cpp @@ -326,7 +326,7 @@ static std::unique_ptr BuildTableWithSparseEntries( return table; } -TEST_F(TableFlattenerTest, FlattenSparseEntryWithMinSdkO) { +TEST_F(TableFlattenerTest, FlattenSparseEntryWithMinSdkSV2) { std::unique_ptr context = test::ContextBuilder() .SetCompilationPackage("android") .SetPackageId(0x01) @@ -369,7 +369,7 @@ TEST_F(TableFlattenerTest, FlattenSparseEntryWithMinSdkO) { EXPECT_EQ(4u, value->value.data); } -TEST_F(TableFlattenerTest, FlattenSparseEntryWithConfigSdkVersionO) { +TEST_F(TableFlattenerTest, FlattenSparseEntryWithConfigSdkVersionSV2) { std::unique_ptr context = test::ContextBuilder() .SetCompilationPackage("android") .SetPackageId(0x01) @@ -388,7 +388,7 @@ TEST_F(TableFlattenerTest, FlattenSparseEntryWithConfigSdkVersionO) { std::string sparse_contents; ASSERT_TRUE(Flatten(context.get(), options, table_in.get(), &sparse_contents)); - EXPECT_GT(no_sparse_contents.size(), sparse_contents.size()); + EXPECT_EQ(no_sparse_contents.size(), sparse_contents.size()); } TEST_F(TableFlattenerTest, FlattenSparseEntryRegardlessOfMinSdkWhenForced) {