diff options
author | Adam Lesinski <adamlesinski@google.com> | 2016-03-31 13:33:02 -0700 |
---|---|---|
committer | Adam Lesinski <adamlesinski@google.com> | 2016-03-31 16:43:04 -0700 |
commit | 6cbfb1de493e42d937158ed57495c9656864ccba (patch) | |
tree | cfc5c985a647ba2282904b028e20409d45b43635 /tools/aapt2/java/JavaClassGenerator.h | |
parent | becc30196dbd6ebe68726c984a448c90fa6ef167 (diff) |
AAPT2: Change how we generate Java classes
Previously we would be writing out the Manifest.java file as we
processed the AndroidManifest.xml. This would lead to empty
Manifest classes if there were no permissions or permission groups
defined in the AndroidManifest.xml.
This would pose problems for processes that checked for public classes
and considered them part of the API (support lib).
Now we collect the structure of the Java class in memory before deciding
if a file should be created.
Change-Id: I6b909f28d74356414c6ef5ad005180d6ea5e44ca
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.h')
-rw-r--r-- | tools/aapt2/java/JavaClassGenerator.h | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/tools/aapt2/java/JavaClassGenerator.h b/tools/aapt2/java/JavaClassGenerator.h index 7e46f8c9043c..b594a88728f4 100644 --- a/tools/aapt2/java/JavaClassGenerator.h +++ b/tools/aapt2/java/JavaClassGenerator.h @@ -28,7 +28,7 @@ namespace aapt { class AnnotationProcessor; -class ClassDefinitionWriter; +class ClassDefinition; struct JavaClassGeneratorOptions { /* @@ -70,16 +70,15 @@ public: const std::string& getError() const; private: - bool writeEntriesForClass(ClassDefinitionWriter* outClassDef, - const StringPiece16& packageNameToGenerate, - const ResourceTablePackage* package, - const ResourceTableType* type); - - void writeStyleableEntryForClass(ClassDefinitionWriter* outClassDef, - AnnotationProcessor* processor, - const StringPiece16& packageNameToGenerate, - const std::u16string& entryName, - const Styleable* styleable); + bool addMembersToTypeClass(const StringPiece16& packageNameToGenerate, + const ResourceTablePackage* package, + const ResourceTableType* type, + ClassDefinition* outTypeClassDef); + + void addMembersToStyleableClass(const StringPiece16& packageNameToGenerate, + const std::u16string& entryName, + const Styleable* styleable, + ClassDefinition* outStyleableClassDef); bool skipSymbol(SymbolState state); |