diff options
author | 2018-01-10 13:10:47 -0800 | |
---|---|---|
committer | 2018-01-10 13:12:55 -0800 | |
commit | ee28bc3a15a7eeeccf21b39b3d307b64ae8acee4 (patch) | |
tree | 744dd777fafa131fe1d644da0b5d4a4637fd9c03 /src/tools/android/java/com/google/devtools/build/android/AndroidCompiledDataDeserializer.java | |
parent | ea41dc4f5179533c3c54a786848157cc17dccac2 (diff) |
Fix parsing for some aapt2-generated resources.
RELNOTES: none
PiperOrigin-RevId: 181506851
Diffstat (limited to 'src/tools/android/java/com/google/devtools/build/android/AndroidCompiledDataDeserializer.java')
-rw-r--r-- | src/tools/android/java/com/google/devtools/build/android/AndroidCompiledDataDeserializer.java | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidCompiledDataDeserializer.java b/src/tools/android/java/com/google/devtools/build/android/AndroidCompiledDataDeserializer.java index 265d938fea..232eaa5576 100644 --- a/src/tools/android/java/com/google/devtools/build/android/AndroidCompiledDataDeserializer.java +++ b/src/tools/android/java/com/google/devtools/build/android/AndroidCompiledDataDeserializer.java @@ -171,13 +171,16 @@ public class AndroidCompiledDataDeserializer implements AndroidDataDeserializer } for (CompiledFile.Symbol exportedSymbol : compiledFile.getExportedSymbolList()) { - FullyQualifiedName symbolFqn = - fqnFactory.create( - ResourceType.ID, exportedSymbol.getResourceName().replaceFirst("id/", "")); - - DataResourceXml dataResourceXml = - DataResourceXml.from(null, dataSource, ResourceType.ID, null); - consumers.combiningConsumer.accept(symbolFqn, dataResourceXml); + if (!exportedSymbol.getResourceName().startsWith("android:")) { + // Skip writing resource xml's for resources in the sdk + FullyQualifiedName symbolFqn = + fqnFactory.create( + ResourceType.ID, exportedSymbol.getResourceName().replaceFirst("id/", "")); + + DataResourceXml dataResourceXml = + DataResourceXml.from(null, dataSource, ResourceType.ID, null); + consumers.combiningConsumer.accept(symbolFqn, dataResourceXml); + } } } |