diff options
| author | Ryan Mitchell <rtmitchell@google.com> | 2021-03-29 20:04:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-03-29 20:04:00 +0000 |
| commit | 0f97905040606c3bba2f90d9dba33c16cb76873a (patch) | |
| tree | e05d77ff63ccf67680d0c58ae6ce1de6be11a645 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 74d4d0297792a42aca2cd11cab3cae851d2b0401 (diff) | |
| parent | 1d008d1d2a73a8b796add4e18924fcc99220a839 (diff) | |
Merge changes I851f9fb9,I60dbcb24 into sc-dev
* changes:
Refactor aapt2 tests ResourceTable changes
Prepare aapt2 for multiple ids per type
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
| -rw-r--r-- | tools/aapt2/java/JavaClassGenerator.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/aapt2/java/JavaClassGenerator.cpp b/tools/aapt2/java/JavaClassGenerator.cpp index 59dd481607e9..039448e1b3e9 100644 --- a/tools/aapt2/java/JavaClassGenerator.cpp +++ b/tools/aapt2/java/JavaClassGenerator.cpp @@ -542,8 +542,8 @@ bool JavaClassGenerator::ProcessType(const StringPiece& package_name_to_generate // Create an ID if there is one (static libraries don't need one). ResourceId id; - if (package.id && type.id && entry->id) { - id = ResourceId(package.id.value(), type.id.value(), entry->id.value()); + if (entry->id) { + id = entry->id.value(); } // We need to make sure we hide the fact that we are generating kAttrPrivate attributes. |