diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2016-03-04 23:46:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-03-04 23:46:49 +0000 |
| commit | 8b030cce347dbfc5c2f33d96daf1de7eeb219c76 (patch) | |
| tree | 9a63118b4c67ff4b6cea585dc65bd011152db401 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | d78520192a73166c905d8df2ddb272de674045e2 (diff) | |
| parent | 64587af8179affd38ee26543b748f2d63b7f67bb (diff) | |
Merge "AAPT2: Support building, linking, and merging static libraries" into nyc-dev
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
| -rw-r--r-- | tools/aapt2/java/JavaClassGenerator.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/aapt2/java/JavaClassGenerator.cpp b/tools/aapt2/java/JavaClassGenerator.cpp index 6e340a2a2742..9e94d4276f5e 100644 --- a/tools/aapt2/java/JavaClassGenerator.cpp +++ b/tools/aapt2/java/JavaClassGenerator.cpp @@ -223,8 +223,10 @@ bool JavaClassGenerator::writeEntriesForClass(ClassDefinitionWriter* outClassDef continue; } - ResourceId id(package->id.value(), type->id.value(), entry->id.value()); - assert(id.isValid()); + ResourceId id; + if (package->id && type->id && entry->id) { + id = ResourceId(package->id.value(), type->id.value(), entry->id.value()); + } std::u16string unmangledPackage; std::u16string unmangledName = entry->name; |