diff options
| author |  Googler <noreply@google.com> | 2018-04-24 16:45:29 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-04-24 16:47:26 -0700 |
| commit | 7b0d676d5f91bbc6778e99902b7667a395303b86 (patch) | |
| tree | bed46a036b77e781cf5dfc01bf3d2d744472179a /src/tools | |
| parent | 9b389d07d7355f76a0552b36b13a25491e95928b (diff) | |
Automated rollback of commit 047688a129b444ba918ae4c31767dce73b17b049.
*** Reason for rollback ***
This broke Hangouts Meet on Android tests: []
*** Original change description ***
Add support for pseudo locales to ResourceLinker.
RELNOTES: None
PiperOrigin-RevId: 194167109
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceLinker.java | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceLinker.java b/src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceLinker.java index a6aa91e848..c2bfc60abe 100644 --- a/src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceLinker.java +++ b/src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceLinker.java @@ -21,7 +21,6 @@ import com.google.common.base.Joiner; import com.google.common.base.MoreObjects; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; import com.google.common.collect.Streams; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.devtools.build.android.AaptCommandBuilder; @@ -49,9 +48,6 @@ import java.util.stream.Stream; /** Performs linking of {@link CompiledResources} using aapt2. */ public class ResourceLinker { - private static final ImmutableSet<String> PSEUDO_LOCALES_CONFIGS = - ImmutableSet.of("en_XA", "ar_XB"); - private static final ImmutableSet<String> PSEUDO_LOCALES = ImmutableSet.of("en-rXA", "ar-rXB"); private boolean debug; /** Represents errors thrown during linking. */ @@ -304,9 +300,9 @@ public class ResourceLinker { Path mainDexProguard = workingDirectory.resolve("proguard.maindex.cfg"); Path javaSourceDirectory = Files.createDirectories(workingDirectory.resolve("java")); Path resourceIds = workingDirectory.resolve("ids.txt"); - Path pseudoSplit = workingDirectory.resolve("pseudo-split.apk"); + profiler.startTask("fulllink"); - logger.fine( + logger.finer( new AaptCommandBuilder(aapt2) .forBuildToolsVersion(buildToolsVersion) .forVariantType(VariantType.DEFAULT) @@ -343,8 +339,6 @@ public class ResourceLinker { // Filter by resource configuration type. .when(!resourceConfigs.isEmpty()) .thenAdd("-c", Joiner.on(',').join(resourceConfigs)) - .when(resourceConfigs.stream().noneMatch(PSEUDO_LOCALES_CONFIGS::contains)) - .thenAdd("--split", pseudoSplit + ":" + Joiner.on(",").join(PSEUDO_LOCALES)) .add("--output-text-symbols", rTxt) .add("--emit-ids", resourceIds) .add("--java", javaSourceDirectory) |