drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AAPT2: Add version collapsing

Browse Source 
When an app specifies (or imports) resources with various
configurations for different SDK versions, specifying
a minSdk will make many of those resources unreachable.

Version collapsing will prune out the resources specified
for SDK versions less than the minSdk.

If, however, there is no exact matching resource for the
minSdk version, the next smallest SDK version is kept.

Change-Id: Ic7bcab6c59d65c97c67c8767358abb57cdec60a4
This commit is contained in:
Adam Lesinski
2016-06-28 14:40:32 -07:00
parent 4c62cbda12
commit fb6312fe93
20 changed files with 371 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
tools/aapt2/link/VersionCollapser_test.cpp Normal file
View File

@ -0,0 +1,93 @@
/*
* Copyright (C) 2016 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.
*/
#include "link/Linkers.h"
#include "test/Test.h"
namespace aapt {
template <typename T>
using uptr = std::unique_ptr<T>;
static uptr<ResourceTable> buildTableWithConfigs(const StringPiece16& name,
std::initializer_list<std::string> list) {
test::ResourceTableBuilder builder;
for (const std::string& item : list) {
builder.addSimple(name, test::parseConfigOrDie(item));
}
return builder.build();
}
TEST(VersionCollapserTest, CollapseVersions) {
uptr<IAaptContext> context = test::ContextBuilder().setMinSdkVersion(7).build();
const StringPiece16 resName = u"@android:string/foo";
uptr<ResourceTable> table =
buildTableWithConfigs(resName,
{ "land-v4", "land-v5", "sw600dp", "land-v6",
"land-v14", "land-v21" });
VersionCollapser collapser;
ASSERT_TRUE(collapser.consume(context.get(), table.get()));
// These should be removed.
EXPECT_EQ(nullptr,
test::getValueForConfig<Id>(table.get(), resName, test::parseConfigOrDie("land-v4")));
EXPECT_EQ(nullptr,
test::getValueForConfig<Id>(table.get(), resName, test::parseConfigOrDie("land-v5")));
// These should remain.
EXPECT_NE(nullptr,
test::getValueForConfig<Id>(table.get(), resName, test::parseConfigOrDie("sw600dp")));
EXPECT_NE(nullptr,
test::getValueForConfig<Id>(table.get(), resName, test::parseConfigOrDie("land-v6")));
EXPECT_NE(nullptr,
test::getValueForConfig<Id>(table.get(), resName, test::parseConfigOrDie("land-v14")));
EXPECT_NE(nullptr,
test::getValueForConfig<Id>(table.get(), resName, test::parseConfigOrDie("land-v21")));
}
TEST(VersionCollapserTest, CollapseVersionsWhenMinSdkIsHighest) {
uptr<IAaptContext> context = test::ContextBuilder().setMinSdkVersion(26).build();
const StringPiece16 resName = u"@android:string/foo";
uptr<ResourceTable> table =
buildTableWithConfigs(resName,
{ "land-v4", "land-v5", "sw600dp", "land-v6",
"land-v14", "land-v21" });
VersionCollapser collapser;
ASSERT_TRUE(collapser.consume(context.get(), table.get()));
// These should all be removed.
EXPECT_EQ(nullptr,
test::getValueForConfig<Id>(table.get(), resName, test::parseConfigOrDie("land-v4")));
EXPECT_EQ(nullptr,
test::getValueForConfig<Id>(table.get(), resName, test::parseConfigOrDie("land-v5")));
EXPECT_EQ(nullptr,
test::getValueForConfig<Id>(table.get(), resName, test::parseConfigOrDie("land-v6")));
EXPECT_EQ(nullptr,
test::getValueForConfig<Id>(table.get(), resName, test::parseConfigOrDie("land-v14")));
// These should remain.
EXPECT_NE(nullptr,
test::getValueForConfig<Id>(table.get(), resName, test::parseConfigOrDie("sw600dp")));
EXPECT_NE(nullptr,
test::getValueForConfig<Id>(table.get(), resName, test::parseConfigOrDie("land-v21")));
}
} // namespace aapt