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

AAPT2: Fix R.java for styleable in different package

Browse Source 
When generating the R.java file, attributes of styleables do not always
have package names on them. This caused a problem where when an apk
that was previously linked and that also contained a declare-styleable
is linked again to an AndroidManifest.xml with a different package name,
styleable attributes' resource symbols could not be looked up correctly.

This change does not rename the resources but makes sure that the java
generator finds the attribute symbols correctly.

Bug: 110877419
Test: Created a test in aapt2_tests and verified correct behavior of
repro example from bug

Change-Id: Ib99d84cbe44dadca86603bc610ad3f4e09e3fb11
This commit is contained in:
Ryan Mitchell
2018-07-12 17:16:40 -07:00
parent 53208af20d
commit 23cc5d5dbe
2 changed files with 63 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -107,6 +107,55 @@ TEST(JavaClassGeneratorTest, CorrectPackageNameIsUsed) {
EXPECT_THAT(output, Not(HasSubstr("com_foo$two")));
}
TEST(JavaClassGeneratorTest, StyleableAttributesWithDifferentPackageName) {
std::unique_ptr<ResourceTable> table =
test::ResourceTableBuilder()
.SetPackageId("android", 0x01)
.SetPackageId("app", 0x7f)
.AddValue("app:attr/foo", ResourceId(0x7f010000),
test::AttributeBuilder().Build())
.AddValue("app:attr/bar", ResourceId(0x7f010001),
test::AttributeBuilder().Build())
.AddValue("android:attr/baz", ResourceId(0x01010000),
test::AttributeBuilder().Build())
.AddValue("app:styleable/MyStyleable", ResourceId(0x7f030000),
test::StyleableBuilder()
.AddItem("app:attr/foo", ResourceId(0x7f010000))
.AddItem("attr/bar", ResourceId(0x7f010001))
.AddItem("android:attr/baz", ResourceId(0x01010000))
.Build())
.Build();
std::unique_ptr<IAaptContext> context =
test::ContextBuilder()
.AddSymbolSource(util::make_unique<ResourceTableSymbolSource>(table.get()))
.SetNameManglerPolicy(NameManglerPolicy{"custom"})
.SetCompilationPackage("custom")
.Build();
JavaClassGenerator generator(context.get(), table.get(), {});
std::string output;
StringOutputStream out(&output);
EXPECT_TRUE(generator.Generate("app", &out));
out.Flush();
EXPECT_THAT(output, Not(HasSubstr("public static final int baz=0x01010000;")));
EXPECT_THAT(output, HasSubstr("public static final int foo=0x7f010000;"));
EXPECT_THAT(output, HasSubstr("public static final int bar=0x7f010001;"));
EXPECT_THAT(output, HasSubstr("public static final int MyStyleable_android_baz=0;"));
EXPECT_THAT(output, HasSubstr("public static final int MyStyleable_foo=1;"));
EXPECT_THAT(output, HasSubstr("public static final int MyStyleable_bar=2;"));
EXPECT_THAT(output, HasSubstr("@link #MyStyleable_android_baz android:baz"));
EXPECT_THAT(output, HasSubstr("@link #MyStyleable_foo app:foo"));
EXPECT_THAT(output, HasSubstr("@link #MyStyleable_bar app:bar"));
EXPECT_THAT(output, HasSubstr("@link android.R.attr#baz"));
EXPECT_THAT(output, HasSubstr("@link app.R.attr#foo"));
EXPECT_THAT(output, HasSubstr("@link app.R.attr#bar"));
}
TEST(JavaClassGeneratorTest, AttrPrivateIsWrittenAsAttr) {
std::unique_ptr<ResourceTable> table =
test::ResourceTableBuilder()