From b274e35abfbbd09e0fce983a215c11522c56cce2 Mon Sep 17 00:00:00 2001 From: Adam Lesinski Date: Fri, 6 Nov 2015 15:14:35 -0800 Subject: AAPT2: Fix inclusion of comments in R.java javadoc Comments weren't being copied when merged from the various resource tables. Also refactored the JavaClassGenerator to omit a class if no entries exist for it. Change-Id: I6eaa89b7b3715bc05403635a2baf0d1db3efd142 --- tools/aapt2/ResourceParser.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools/aapt2/ResourceParser.cpp') diff --git a/tools/aapt2/ResourceParser.cpp b/tools/aapt2/ResourceParser.cpp index 39a4116435c8..5172fab1854b 100644 --- a/tools/aapt2/ResourceParser.cpp +++ b/tools/aapt2/ResourceParser.cpp @@ -973,7 +973,7 @@ bool ResourceParser::parseDeclareStyleable(XmlPullParser* parser, ParsedResource const Source source = mSource.withLine(parser->getLineNumber()); std::unique_ptr styleable = util::make_unique(); - // Declare-styleable is always public, because it technically only exists in R.java. + // Declare-styleable is kPrivate by default, because it technically only exists in R.java. outResource->symbolState = SymbolState::kPublic; std::u16string comment; -- cgit v1.2.3-59-g8ed1b