[Android] Enable multidex for release builds of chrome_public_test_apk.

[Android] Enable multidex for release builds of chrome_public_test_apk.

BUG=712852
Review-Url: https://codereview.chromium.org/2836723002
Cr-Commit-Position: refs/heads/master@{#466659}
Committed: https://chromium.googlesource.com/chromium/src/+/026ed39fd157f3afe2a6315571ddbc1012f9061e

[jbudorick, 2017-04-21 22:07:29]

The CQ bit was checked by jbudorick@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-04-21 22:08:25]

Dry run: CQ is trying da patch.

Follow status at:
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[jbudorick, 2017-04-22 02:50:41]

jbudorick@chromium.org changed reviewers:
+ agrieve@chromium.org

[agrieve, 2017-04-23 01:47:52]

PackageManagerWarpper is a bit :(, but since it's needed only in test code I
think it's fine.

lgtm, but if the one proguard -keep I asked about really is needed, please
measure size of Chrome's classes.dex before & after to see if it causes it to
grow.

https://codereview.chromium.org/2836723002/diff/40001/base/test/android/javat...
File
base/test/android/javatests/src/org/chromium/base/test/BaseChromiumAndroidJUnitRunner.java
(right):

https://codereview.chromium.org/2836723002/diff/40001/base/test/android/javat...
base/test/android/javatests/src/org/chromium/base/test/BaseChromiumAndroidJUnitRunner.java:20:
public class BaseChromiumAndroidJUnitRunner extends AndroidJUnitRunner {
Does this one need @MainDex?

https://codereview.chromium.org/2836723002/diff/40001/base/test/android/javat...
File
base/test/android/javatests/src/org/chromium/base/test/BaseChromiumRunnerCommon.java
(right):

https://codereview.chromium.org/2836723002/diff/40001/base/test/android/javat...
base/test/android/javatests/src/org/chromium/base/test/BaseChromiumRunnerCommon.java:145:
return s1.toString().compareTo(s2.toString());
no need for toString() here.

https://codereview.chromium.org/2836723002/diff/40001/base/test/android/javat...
File
base/test/android/javatests/src/org/chromium/base/test/PackageManagerWrapper.java
(right):

https://codereview.chromium.org/2836723002/diff/40001/base/test/android/javat...
base/test/android/javatests/src/org/chromium/base/test/PackageManagerWrapper.java:104:
@Override
Delete these?

https://codereview.chromium.org/2836723002/diff/40001/build/android/multidex....
File build/android/multidex.flags (right):

https://codereview.chromium.org/2836723002/diff/40001/build/android/multidex....
build/android/multidex.flags:10: -keep @**.MainDex class * {
Not sure about this one. Why would we want to have @MainDex cause code to be not
stripped?

[jbudorick, 2017-04-24 15:01:16]

The CQ bit was checked by jbudorick@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-04-24 15:02:12]

Dry run: CQ is trying da patch.

Follow status at:
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[jbudorick, 2017-04-24 15:05:00]

PackageManagerWrapper is indeed a bit :(, but I think we'll be able to remove it
when a version of the multidex support lib that includes
https://android.googlesource.com/platform/frameworks/multidex/+/606af94785cb9...
is released.

https://codereview.chromium.org/2836723002/diff/40001/base/test/android/javat...
File
base/test/android/javatests/src/org/chromium/base/test/BaseChromiumAndroidJUnitRunner.java
(right):

https://codereview.chromium.org/2836723002/diff/40001/base/test/android/javat...
base/test/android/javatests/src/org/chromium/base/test/BaseChromiumAndroidJUnitRunner.java:20:
public class BaseChromiumAndroidJUnitRunner extends AndroidJUnitRunner {
On 2017/04/23 01:47:52, agrieve wrote:
> Does this one need @MainDex?

No, nor does BaseChromiumInstrumentationTestRunner. That one was a relic from
attempts at getting proguard to keep MultiDexContextWrapper.

https://codereview.chromium.org/2836723002/diff/40001/base/test/android/javat...
File
base/test/android/javatests/src/org/chromium/base/test/BaseChromiumRunnerCommon.java
(right):

https://codereview.chromium.org/2836723002/diff/40001/base/test/android/javat...
base/test/android/javatests/src/org/chromium/base/test/BaseChromiumRunnerCommon.java:145:
return s1.toString().compareTo(s2.toString());
On 2017/04/23 01:47:52, agrieve wrote:
> no need for toString() here.

oops, leftover from o1/o2.

Done.

https://codereview.chromium.org/2836723002/diff/40001/base/test/android/javat...
File
base/test/android/javatests/src/org/chromium/base/test/PackageManagerWrapper.java
(right):

https://codereview.chromium.org/2836723002/diff/40001/base/test/android/javat...
base/test/android/javatests/src/org/chromium/base/test/PackageManagerWrapper.java:104:
@Override
On 2017/04/23 01:47:52, agrieve wrote:
> Delete these?

Hm, missed a couple.

Done.

https://codereview.chromium.org/2836723002/diff/40001/build/android/multidex....
File build/android/multidex.flags (right):

https://codereview.chromium.org/2836723002/diff/40001/build/android/multidex....
build/android/multidex.flags:10: -keep @**.MainDex class * {
On 2017/04/23 01:47:52, agrieve wrote:
> Not sure about this one. Why would we want to have @MainDex cause code to be
not
> stripped?

If we're trying to retain something in the main dex, presumably we want it to
not be stripped prior to dexing.

This file is only used when we're proguarding a multidex APK, so it will not
affect release builds of Chrome.

[commit-bot: I haz the power, 2017-04-24 16:26:44]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-04-24 16:26:45]

Dry run: This issue passed the CQ dry run.

[jbudorick, 2017-04-24 16:33:42]

The CQ bit was checked by jbudorick@chromium.org

[jbudorick, 2017-04-24 16:33:42]

The patchset sent to the CQ was uploaded after l-g-t-m from agrieve@chromium.org
Link to the patchset: https://codereview.chromium.org/2836723002/#ps60001
(title: "agrieve comments")

[commit-bot: I haz the power, 2017-04-24 16:34:16]

CQ is trying da patch.

Follow status at:
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-04-24 16:41:26]

CQ is committing da patch.

Bot data: {"patchset_id": 60001, "attempt_start_ts": 1493051622423320,
"parent_rev": "7c6a3e3baf6ad88f8a28ac4ef7d46664d95c9e74", "commit_rev":
"026ed39fd157f3afe2a6315571ddbc1012f9061e"}

[commit-bot: I haz the power, 2017-04-24 16:41:38]

Description was changed from

==========
[Android] Enable multidex for release builds of chrome_public_test_apk.

BUG=712852
==========

to

==========
[Android] Enable multidex for release builds of chrome_public_test_apk.

BUG=712852

Review-Url: https://codereview.chromium.org/2836723002
Cr-Commit-Position: refs/heads/master@{#466659}
Committed:
https://chromium.googlesource.com/chromium/src/+/026ed39fd157f3afe2a6315571dd...
==========

[commit-bot: I haz the power, 2017-04-24 16:41:39]

Committed patchset #4 (id:60001) as
https://chromium.googlesource.com/chromium/src/+/026ed39fd157f3afe2a6315571dd...

[jbudorick, 2017-04-24 22:18:14]

A revert of this CL (patchset #4 id:60001) has been created in
https://codereview.chromium.org/2837123003/ by jbudorick@chromium.org.

The reason for reverting is: Breaks on O..