commit b0e962f37d55a46d1bb4c92577f352cb48d64d53
author Andrew Grieve <agrieve@chromium.org> Mon Aug 27 17:59:40 2018
committer Commit Bot <commit-bot@chromium.org> Mon Aug 27 17:59:40 2018
tree 336df55e9b9638050e7fa8cb9e4765a341f36f90
parent a3729bea473bb5ffc5eaf289f5733bc5e2861c07

Reland "Android: Update version of retrace.jar to 6.0.3"

Reverted in: 78561f5b9dca2d5e742a43ddf0f553eaf4a76c70

Reason for reland:
 * Should now work with swarming
 * Contains fix for angle_perftest (ran locally)

The existing version was found to infinite loop at times.
Also moves the jars to CIPD

Bug: 876539, 877619
Change-Id: I9564c9b5dd6339abd1ded62d9bba98f9692a601d
Reviewed-on: https://chromium-review.googlesource.com/1188601
Reviewed-by: John Budorick <jbudorick@chromium.org>
Commit-Queue: agrieve <agrieve@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#586312}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 40dece27d6b58fb916aa8d27aadaa5def856584f

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index e43a60d..aa11967 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -4,19 +4,21 @@
 
 import("//build/config/android/rules.gni")
 
-java_prebuilt("proguard_java") {
-  jar_path = "lib/proguard.jar"
+# This target is used only by retrace. proguard.jar (v5.2.1) is used for
+# compiling, and is reference directly via "java -jar proguar.jar"
+java_prebuilt("proguard603_java") {
+  jar_path = "lib/proguard603.jar"
   data = [
-    "$root_build_dir/lib.java/third_party/proguard/proguard.jar",
+    "$root_build_dir/lib.java/third_party/proguard/proguard603.jar",
   ]
 }
 
 java_prebuilt("retrace_java") {
-  jar_path = "lib/retrace.jar"
+  jar_path = "lib/retrace603.jar"
   deps = [
-    ":proguard_java",
+    ":proguard603_java",
   ]
   data = [
-    "$root_build_dir/lib.java/third_party/proguard/retrace.jar",
+    "$root_build_dir/lib.java/third_party/proguard/retrace603.jar",
   ]
 }

README.chromium

diff --git a/README.chromium b/README.chromium
index 14b6982..bd0aceb 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: Proguard
 URL: http://proguard.sourceforge.net/
-Version: 5.2.1
+Version: 5.2.1_and_6.0.3
 Date: June 22, 2016
 License: GPL v2
 License File: NOT_SHIPPED
@@ -10,3 +10,7 @@
 This directory includes proguard.jar to allow Chromium to shrink, optimize java
 classes for Android, as well as retrace.jar, to allow for deobfuscation of stack
 traces.
+
+Proguard is kept at 5.2.1 because all newer versions were found to optimize in a
+way that breaks Chrome. Retrace is at 6.0.3 because version 5.2.1 was found to
+infinite loop when deobfuscating certainly strings.

cipd.yaml

diff --git a/cipd.yaml b/cipd.yaml
new file mode 100644
index 0000000..ddcbd18
--- /dev/null
+++ b/cipd.yaml
@@ -0,0 +1,11 @@
+# Copyright 2018 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# To create CIPD package run the following command.
+# cipd create --pkg-def cipd.yaml
+package: chromium/third_party/proguard
+data:
+  - file: lib/proguard.jar
+  - file: lib/proguard603.jar
+  - file: lib/retrace603.jar

lib/proguard.jar

diff --git a/lib/proguard.jar b/lib/proguard.jar
deleted file mode 100644
index c670fe9..0000000
--- a/lib/proguard.jar
+++ /dev/null
Binary files differ

lib/retrace.jar

diff --git a/lib/retrace.jar b/lib/retrace.jar
deleted file mode 100644
index 408712f..0000000
--- a/lib/retrace.jar
+++ /dev/null
Binary files differ