diff options
author | corysmith <corysmith@google.com> | 2018-05-03 14:37:53 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-05-03 14:39:44 -0700 |
commit | f39226cb2a489753ddccb06078cafe1e646b2ef1 (patch) | |
tree | 2f251a86b820dbd83f1d189a9cc9bc562ed78ef1 /src/tools/android/java/com/google/devtools/build/android/aapt2 | |
parent | 0ffacb062fe471dd4d2472dbce172bec21313ef6 (diff) |
Extract Qualifiers class for reuse.
Also, introduce caching for duplicated qualifiers.
RELNOTES:None
PiperOrigin-RevId: 195313195
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, 1 insertions, 3 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 b734eaa36a..355fcbf4d0 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,7 +14,6 @@ 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; @@ -195,8 +194,7 @@ public class ResourceCompiler { Namespaces namespaces = Namespaces.from(qName); String attributeName = namespaceUri.isEmpty() ? localPart : prefix + ":" + localPart; - final String[] dirNameAndQualifiers = type.split(SdkConstants.RES_QUALIFIER_SEP); - Factory fqnFactory = Factory.fromDirectoryName(dirNameAndQualifiers); + Factory fqnFactory = Factory.fromDirectoryName(type); FullyQualifiedName fqn = fqnFactory.create(VirtualType.RESOURCES_ATTRIBUTE, qName.toString()); ResourcesAttribute resourceAttribute = |