diff options
| author | Brian Orr <brianorr@google.com> | 2021-05-14 18:52:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-05-14 18:52:34 +0000 |
| commit | 5cc0425e7e8c39fd412a45a6cec0e64fa3269657 (patch) | |
| tree | b4f41ed6b8ead81fb4d040075eda1973fa6eb1be /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 2ab32d50b54010c8d66903674ee3b2138f9e8d0e (diff) | |
| parent | 3cc63724673b4829450b4e2f6db88154df98f33e (diff) | |
Merge changes from topic "SP1A.210510.001" into s-keystone-qcom-dev
* changes:
Add AttributionSource parameter where needed
Merge SP1A.210510.001
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
| -rw-r--r-- | tools/aapt2/java/JavaClassGenerator.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/aapt2/java/JavaClassGenerator.cpp b/tools/aapt2/java/JavaClassGenerator.cpp index e1e2e0135cf7..de6524dc7027 100644 --- a/tools/aapt2/java/JavaClassGenerator.cpp +++ b/tools/aapt2/java/JavaClassGenerator.cpp @@ -616,8 +616,9 @@ bool JavaClassGenerator::Generate(const StringPiece& package_name_to_generate, for (const auto& package : table_->packages) { for (const auto& type : package->types) { - if (type->type == ResourceType::kAttrPrivate) { - // We generate these as part of the kAttr type, so skip them here. + if (type->type == ResourceType::kAttrPrivate || type->type == ResourceType::kMacro) { + // We generate kAttrPrivate as part of the kAttr type, so skip them here. + // Macros are not actual resources, so skip them as well. continue; } |