Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AAPT2: Fix R.java styleable + indices ordering

Browse Source 
Make sure that Styleables are directly followed by their indices.
If not, Robolectric breaks. This is not strictly incorrect to have
an arbitrary ordering in R.java, but its easier to just support
Robolectric in this case.

Bug: 65837293
Test: make aapt2_tests

(cherry picked from commit af85c4deb667843a227d62275fe6992005f4c38d)

Change-Id: Ia59ba58427ade386d075ca9fc9eb5b53e35beca0
This commit is contained in:
Adam Lesinski
2017-09-29 11:15:17 -07:00
parent 43ddc05bbd
commit 761d4341fc
3 changed files with 86 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
tools/aapt2/java/JavaClassGenerator_test.cpp
View File

@@ -24,6 +24,8 @@
using ::android::StringPiece;
using ::testing::HasSubstr;
using ::testing::Lt;
using ::testing::Ne;
using ::testing::Not;
namespace aapt {
@@ -306,6 +308,53 @@ TEST(JavaClassGeneratorTest, CommentsForStyleablesAndNestedAttributesArePresent)
EXPECT_THAT(output, HasSubstr(styleable.GetComment()));
}
TEST(JavaClassGeneratorTest, StyleableAndIndicesAreColocated) {
std::unique_ptr<ResourceTable> table =
test::ResourceTableBuilder()
.SetPackageId("android", 0x01)
.AddValue("android:attr/layout_gravity", util::make_unique<Attribute>())
.AddValue("android:attr/background", util::make_unique<Attribute>())
.AddValue("android:styleable/ActionBar",
test::StyleableBuilder()
.AddItem("android:attr/background", ResourceId(0x01010000))
.Build())
.AddValue("android:styleable/ActionBar.LayoutParams",
test::StyleableBuilder()
.AddItem("android:attr/layout_gravity", ResourceId(0x01010001))
.Build())
.Build();
std::unique_ptr<IAaptContext> context =
test::ContextBuilder()
.AddSymbolSource(util::make_unique<ResourceTableSymbolSource>(table.get()))
.SetNameManglerPolicy(NameManglerPolicy{"android"})
.Build();
JavaClassGeneratorOptions options;
JavaClassGenerator generator(context.get(), table.get(), {});
std::stringstream out;
ASSERT_TRUE(generator.Generate("android", &out));
std::string output = out.str();
std::string::size_type actionbar_pos = output.find("int[] ActionBar");
ASSERT_THAT(actionbar_pos, Ne(std::string::npos));
std::string::size_type actionbar_background_pos = output.find("int ActionBar_background");
ASSERT_THAT(actionbar_background_pos, Ne(std::string::npos));
std::string::size_type actionbar_layout_params_pos = output.find("int[] ActionBar_LayoutParams");
ASSERT_THAT(actionbar_layout_params_pos, Ne(std::string::npos));
std::string::size_type actionbar_layout_params_layout_gravity_pos =
output.find("int ActionBar_LayoutParams_layout_gravity");
ASSERT_THAT(actionbar_layout_params_layout_gravity_pos, Ne(std::string::npos));
EXPECT_THAT(actionbar_pos, Lt(actionbar_background_pos));
EXPECT_THAT(actionbar_pos, Lt(actionbar_layout_params_pos));
EXPECT_THAT(actionbar_background_pos, Lt(actionbar_layout_params_pos));
EXPECT_THAT(actionbar_layout_params_pos, Lt(actionbar_layout_params_layout_gravity_pos));
}
TEST(JavaClassGeneratorTest, CommentsForRemovedAttributesAreNotPresentInClass) {
Attribute attr(false);
attr.SetComment(StringPiece("removed"));