diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2015-11-06 15:14:35 -0800 |
|---|---|---|
| committer | Adam Lesinski <adamlesinski@google.com> | 2015-11-06 16:37:57 -0800 |
| commit | b274e35abfbbd09e0fce983a215c11522c56cce2 (patch) | |
| tree | a30ba5aac504bbdfde8ac6931cb8471a46f6e284 /tools/aapt2/java/ManifestClassGenerator_test.cpp | |
| parent | 557b64abad9915f92a9d35c748766e873f3a29fd (diff) | |
AAPT2: Fix inclusion of comments in R.java javadoc
Comments weren't being copied when merged from the various
resource tables.
Also refactored the JavaClassGenerator to omit a class
if no entries exist for it.
Change-Id: I6eaa89b7b3715bc05403635a2baf0d1db3efd142
Diffstat (limited to 'tools/aapt2/java/ManifestClassGenerator_test.cpp')
| -rw-r--r-- | tools/aapt2/java/ManifestClassGenerator_test.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/aapt2/java/ManifestClassGenerator_test.cpp b/tools/aapt2/java/ManifestClassGenerator_test.cpp index 1b5bc0586f43..4081287a1852 100644 --- a/tools/aapt2/java/ManifestClassGenerator_test.cpp +++ b/tools/aapt2/java/ManifestClassGenerator_test.cpp @@ -39,8 +39,9 @@ TEST(ManifestClassGeneratorTest, NameIsProperlyGeneratedFromSymbol) { std::string actual = out.str(); - const size_t permissionClassPos = actual.find("public static class permission {"); - const size_t permissionGroupClassPos = actual.find("public static class permission_group {"); + const size_t permissionClassPos = actual.find("public static final class permission {"); + const size_t permissionGroupClassPos = + actual.find("public static final class permission_group {"); ASSERT_NE(std::string::npos, permissionClassPos); ASSERT_NE(std::string::npos, permissionGroupClassPos); @@ -113,7 +114,7 @@ R"EOF( /** * @hide * @SystemApi */ - @android.annotations.SystemApi + @android.annotation.SystemApi public static final String SECRET="android.permission.SECRET";)EOF")); } |