diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-23 16:27:59 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-06-23 16:27:59 +0000 |
| commit | 7c72b7f45e16c822df9aaf88f0ba87b47d995d85 (patch) | |
| tree | 808c1fd040be65b53353255403b49c8ab0e330d1 /tools/aapt2/cmd/Link.cpp | |
| parent | 697892fae303f27ba29d5f0ce2ddbf6ddb182e15 (diff) | |
| parent | de6e6f2098042bb91f7dac965d2b047c74c920f2 (diff) | |
Merge "Don't add API annotations in the internal R.java" into rvc-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/cmd/Link.cpp')
| -rw-r--r-- | tools/aapt2/cmd/Link.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/aapt2/cmd/Link.cpp b/tools/aapt2/cmd/Link.cpp index 3a3fb2826b74..72cb41a1b172 100644 --- a/tools/aapt2/cmd/Link.cpp +++ b/tools/aapt2/cmd/Link.cpp @@ -1272,7 +1272,8 @@ class Linker { return false; } - ClassDefinition::WriteJavaFile(manifest_class.get(), package_utf8, true, &fout); + ClassDefinition::WriteJavaFile(manifest_class.get(), package_utf8, true, + false /* strip_api_annotations */, &fout); fout.Flush(); if (fout.HadError()) { |