commit b8639974deab560c43ca6b86e966c62c71118719
author bcsf <bcsf@google.com> Wed Sep 25 07:22:53 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Wed Sep 25 07:23:57 2019 -0700
tree 438045486b92ed0ee0c4017aa40ac2b70102a4fd
parent 2f124194d5d9d45db566d277e7eff946f6e2a580

Update aapt2 executable.

PiperOrigin-RevId: 271118864

src/tools/android/java/com/google/devtools/build/android/Aapt2OptimizeAction.java

diff --git a/src/tools/android/java/com/google/devtools/build/android/Aapt2OptimizeAction.java b/src/tools/android/java/com/google/devtools/build/android/Aapt2OptimizeAction.java
index 94eecd7..ef59255 100644
--- a/src/tools/android/java/com/google/devtools/build/android/Aapt2OptimizeAction.java
+++ b/src/tools/android/java/com/google/devtools/build/android/Aapt2OptimizeAction.java
@@ -51,16 +51,12 @@
                   switch (arg) {
                     case "--shorten-resource-paths":
                     case "--enable-resource-path-shortening":
-                      /* TODO(bcsf): Start using this at the time we drop AAPT2 5880457.
                       return "--shorten-resource-paths";
-                      */
-                      return "--enable-resource-path-shortening";
+
                     case "--collapse-resource-names":
                     case "--enable-resource-name-obfuscation":
-                      /* TODO(bcsf): Start using this at the time we drop AAPT2 5880457.
                       return "--collapse-resource-names";
-                      */
-                      return "--enable-resource-obfuscation";
+
                     case "--resource-name-obfuscation-exemption-list":
                       // TODO(bcsf): This case goes away soon.
                       return "--whitelist-path";