commit 7656554f91b40bc93bf94c89afcad4a9a8ced884
author Adam Lesinski <adamlesinski@google.com> Thu Mar 10 21:55:04 2016 -0800
committer Adam Lesinski <adamlesinski@google.com> Fri Mar 11 00:22:52 2016 -0800
tree 76a275c869513d419dc85ee2b7f946688043e3d9
parent 5b37ef489a4090da3643041c8d0e6efa282ad8b6

AAPT2: Add descriptions of Attributes in Styleables for R.java

Change-Id: I69e7b73cbdfe4baf502348397435c501ae29ff5e

tools/aapt2/ResourceParser.cpp

diff --git a/tools/aapt2/ResourceParser.cpp b/tools/aapt2/ResourceParser.cpp
index b100e84..9704d970 100644
--- a/tools/aapt2/ResourceParser.cpp
+++ b/tools/aapt2/ResourceParser.cpp
@@ -81,6 +81,12 @@
 
 // Recursively adds resources to the ResourceTable.
 static bool addResourcesToTable(ResourceTable* table, IDiagnostics* diag, ParsedResource* res) {
+    StringPiece16 trimmedComment = util::trimWhitespace(res->comment);
+    if (trimmedComment.size() != res->comment.size()) {
+        // Only if there was a change do we re-assign.
+        res->comment = trimmedComment.toString();
+    }
+
     if (res->symbolState) {
         Symbol symbol;
         symbol.state = res->symbolState.value();