From 626b3dbf74f02ae630ae0089632f5962340694dc Mon Sep 17 00:00:00 2001 From: Adam Lesinski Date: Thu, 7 Apr 2016 13:24:59 -0700 Subject: AAPT2: Clean up R JavaDoc generation - Don't generate private attributes in public R.java - Strip out @SystemApi from comment when generating @android.annotation.SystemApi - Only emit a single line (up to the first period) of an attribute's comment within a styleable's attribute table. Change-Id: Id6316a6861540325934133958939a12074ad4428 --- tools/aapt2/java/JavaClassGenerator_test.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp') diff --git a/tools/aapt2/java/JavaClassGenerator_test.cpp b/tools/aapt2/java/JavaClassGenerator_test.cpp index 370e78a7b9d2..7d0aa83a0fb8 100644 --- a/tools/aapt2/java/JavaClassGenerator_test.cpp +++ b/tools/aapt2/java/JavaClassGenerator_test.cpp @@ -43,7 +43,8 @@ TEST(JavaClassGeneratorTest, TransformInvalidJavaIdentifierCharacter) { std::unique_ptr table = test::ResourceTableBuilder() .setPackageId(u"android", 0x01) .addSimple(u"@android:id/hey-man", ResourceId(0x01020000)) - .addSimple(u"@android:attr/cool.attr", ResourceId(0x01010000)) + .addValue(u"@android:attr/cool.attr", ResourceId(0x01010000), + test::AttributeBuilder(false).build()) .addValue(u"@android:styleable/hey.dude", ResourceId(0x01030000), test::StyleableBuilder() .addItem(u"@android:attr/cool.attr", ResourceId(0x01010000)) @@ -199,8 +200,10 @@ TEST(JavaClassGeneratorTest, EmitOtherPackagesAttributesInStyleable) { std::unique_ptr table = test::ResourceTableBuilder() .setPackageId(u"android", 0x01) .setPackageId(u"com.lib", 0x02) - .addSimple(u"@android:attr/bar", ResourceId(0x01010000)) - .addSimple(u"@com.lib:attr/bar", ResourceId(0x02010000)) + .addValue(u"@android:attr/bar", ResourceId(0x01010000), + test::AttributeBuilder(false).build()) + .addValue(u"@com.lib:attr/bar", ResourceId(0x02010000), + test::AttributeBuilder(false).build()) .addValue(u"@android:styleable/foo", ResourceId(0x01030000), test::StyleableBuilder() .addItem(u"@android:attr/bar", ResourceId(0x01010000)) -- cgit v1.2.3