diff options
author | Googler <noreply@google.com> | 2018-05-03 15:29:49 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-05-03 15:31:47 -0700 |
commit | bfbb11bcc55017ed22e99e1f2221b62e0beff609 (patch) | |
tree | ae0082ba50086864e4edde53f6b7ee564ecad412 /src/tools/android/java/com/google/devtools/build/android/aapt2 | |
parent | 36bc96e2e645dec2eca9a8f4174f9ed6b351df51 (diff) |
Internal change
PiperOrigin-RevId: 195321054
Diffstat (limited to 'src/tools/android/java/com/google/devtools/build/android/aapt2')
-rw-r--r-- | src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceCompiler.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceCompiler.java b/src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceCompiler.java index 355fcbf4d0..b734eaa36a 100644 --- a/src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceCompiler.java +++ b/src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceCompiler.java @@ -14,6 +14,7 @@ package com.google.devtools.build.android.aapt2; +import com.android.SdkConstants; import com.android.builder.core.VariantType; import com.android.repository.Revision; import com.google.common.base.Preconditions; @@ -194,7 +195,8 @@ public class ResourceCompiler { Namespaces namespaces = Namespaces.from(qName); String attributeName = namespaceUri.isEmpty() ? localPart : prefix + ":" + localPart; - Factory fqnFactory = Factory.fromDirectoryName(type); + final String[] dirNameAndQualifiers = type.split(SdkConstants.RES_QUALIFIER_SEP); + Factory fqnFactory = Factory.fromDirectoryName(dirNameAndQualifiers); FullyQualifiedName fqn = fqnFactory.create(VirtualType.RESOURCES_ATTRIBUTE, qName.toString()); ResourcesAttribute resourceAttribute = |