commit 9f22204c3a9ddac4f92573c9ab098e6cf3ed1cb4
author Adam Lesinski <adamlesinski@google.com> Wed Nov 04 13:51:45 2015 -0800
committer Adam Lesinski <adamlesinski@google.com> Thu Nov 05 10:56:32 2015 -0800
tree 7146efe6062b17d4a5fb63230ac3e8d64b1f2e17
parent 08322c2152131979a846d399ca6b9bebdbdc0355

AAPT2: Fix small issue with detecting translatable resources

Change-Id: Idd21b5de4d20be06c6f8c8eb5a22ccd68afc4927

tools/aapt2/compile/Compile.cpp

diff --git a/tools/aapt2/compile/Compile.cpp b/tools/aapt2/compile/Compile.cpp
index 0bc5dce..5d90ab9 100644
--- a/tools/aapt2/compile/Compile.cpp
+++ b/tools/aapt2/compile/Compile.cpp
@@ -132,8 +132,15 @@
 
         // Parse the values file from XML.
         XmlPullParser xmlParser(fin);
+
+        ResourceParserOptions parserOptions;
+        parserOptions.product = options.product;
+
+        // If the filename includes donottranslate, then the default translatable is false.
+        parserOptions.translatable = pathData.name.find(u"donottranslate") == std::string::npos;
+
         ResourceParser resParser(context->getDiagnostics(), &table, pathData.source,
-                                 pathData.config, ResourceParserOptions{ options.product });
+                                 pathData.config, parserOptions);
         if (!resParser.parse(&xmlParser)) {
             return false;
         }