[Cronet] Add proguard files for different Cronet packaging

[Cronet] Add proguard files for different Cronet packaging

1. Created three proguard files:
1.1. cronet_impl_common_proguard.cfg - for apps that depend on cronet_impl_common_java.jar
1.2. cronet_impl_platform_proguard.cfg - for apps that depend on cronet_impl_platform_java.jar
1.3. cronet_impl_native_proguard.cfg - for apps that depend on cronet_impl_native_java.jar

2. Enabled proguarding of cronet_sample_apk even for debug builds.

3. Changed cronet_sample_apk & cronet_perf_test_apk to test with proguard
   configs that we ship.

BUG=665446
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.android:android_cronet_tester

Committed: https://crrev.com/cfb46293103925f18c3931a44044ee1a0776345c
Cr-Commit-Position: refs/heads/master@{#435633}

[kapishnikov, 2016-11-29 23:07:20]

Description was changed from

==========
[Cronet] Add proguard files for different Cronet packaging

1. Created three proguard files:
1.1. proguard_common.cfg - for apps that depend on cronet_impl_common_java.jar
1.2. proguard_platform.cfg - for apps that depend on
cronet_impl_platform_java.jar
1.3. proguard_native.cfg - for apps that depend on cronet_impl_native_java.jar

2. Enabled proguarding of cronet_sample_apk even for debug builds.

3. Changed cronet_sample_apk & cronet_perf_test_apk to test with proguard
   configs that we ship.

BUG=665446
==========

to

==========
[Cronet] Add proguard files for different Cronet packaging

1. Created three proguard files:
1.1. proguard_common.cfg - for apps that depend on cronet_impl_common_java.jar
1.2. proguard_platform.cfg - for apps that depend on
cronet_impl_platform_java.jar
1.3. proguard_native.cfg - for apps that depend on cronet_impl_native_java.jar

2. Enabled proguarding of cronet_sample_apk even for debug builds.

3. Changed cronet_sample_apk & cronet_perf_test_apk to test with proguard
   configs that we ship.

BUG=665446
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.android:android_cronet_tester
==========

[kapishnikov, 2016-11-29 23:09:30]

kapishnikov@chromium.org changed reviewers:
+ mef@chromium.org, pauljensen@chromium.org

[kapishnikov, 2016-11-29 23:14:47]

On 2016/11/29 23:09:30, kapishnikov wrote:

Currently, GN is failing when run first time. I have sent the corresponding
question to gn-dev group:
https://groups.google.com/a/chromium.org/forum/#!topic/gn-dev/yTm4xefKd28

[kapishnikov, 2016-11-30 17:54:29]

Filed a bug with a potential fix:
https://bugs.chromium.org/p/chromium/issues/detail?id=669961

[mef, 2016-11-30 18:21:04]

Could you add to the description the list of proguard files that app needs to
include?

https://codereview.chromium.org/2540773003/diff/1/components/cronet/android/B...
File components/cronet/android/BUILD.gn (right):

https://codereview.chromium.org/2540773003/diff/1/components/cronet/android/B...
components/cronet/android/BUILD.gn:437: "$_package_dir/proguard_native.cfg",
I think it is a bit weird to include generated proguard file from package
directory.
Would it make sense to output it into gen directory, and have package and other
targets to depend on it and include it?

We already have a few targets like java_cpp_enum and template generations.

[kapishnikov, 2016-11-30 21:22:04]

I added to the description:
1.1. proguard_common.cfg - for apps that depend on cronet_impl_common_java.jar
1.2. proguard_platform.cfg - for apps that depend on
cronet_impl_platform_java.jar
1.3. proguard_native.cfg - for apps that depend on cronet_impl_native_java.jar

https://codereview.chromium.org/2540773003/diff/1/components/cronet/android/B...
File components/cronet/android/BUILD.gn (right):

https://codereview.chromium.org/2540773003/diff/1/components/cronet/android/B...
components/cronet/android/BUILD.gn:437: "$_package_dir/proguard_native.cfg",
On 2016/11/30 18:21:04, mef wrote:
> I think it is a bit weird to include generated proguard file from package
> directory.
> Would it make sense to output it into gen directory, and have package and
other
> targets to depend on it and include it?
> 
> We already have a few targets like java_cpp_enum and template generations.

Good idea. Done!

[kapishnikov, 2016-11-30 21:57:01]

Description was changed from

==========
[Cronet] Add proguard files for different Cronet packaging

1. Created three proguard files:
1.1. proguard_common.cfg - for apps that depend on cronet_impl_common_java.jar
1.2. proguard_platform.cfg - for apps that depend on
cronet_impl_platform_java.jar
1.3. proguard_native.cfg - for apps that depend on cronet_impl_native_java.jar

2. Enabled proguarding of cronet_sample_apk even for debug builds.

3. Changed cronet_sample_apk & cronet_perf_test_apk to test with proguard
   configs that we ship.

BUG=665446
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.android:android_cronet_tester
==========

to

==========
[Cronet] Add proguard files for different Cronet packaging

1. Created three proguard files:
1.1. cronet_impl_common_proguard.cfg - for apps that depend on
cronet_impl_common_java.jar
1.2. cronet_impl_platform_proguard.cfg - for apps that depend on
cronet_impl_platform_java.jar
1.3. cronet_impl_native_proguard.cfg - for apps that depend on
cronet_impl_native_java.jar

2. Enabled proguarding of cronet_sample_apk even for debug builds.

3. Changed cronet_sample_apk & cronet_perf_test_apk to test with proguard
   configs that we ship.

BUG=665446
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.android:android_cronet_tester
==========

[kapishnikov, 2016-11-30 21:59:10]

As Misha suggested, changed the proguard file names to better match the
associated jar names.

[mef, 2016-11-30 22:13:45]

lgtm with nits.

https://codereview.chromium.org/2540773003/diff/40001/components/cronet/andro...
File components/cronet/android/BUILD.gn (right):

https://codereview.chromium.org/2540773003/diff/40001/components/cronet/andro...
components/cronet/android/BUILD.gn:1053:
rebase_path("//components/cronet/android/cronet_impl_native_proguard.cfg",
nit: Should this file be first, so generated file starts with its content
(including comment)?

https://codereview.chromium.org/2540773003/diff/40001/components/cronet/andro...
File components/cronet/android/cronet_impl_native_proguard.cfg (right):

https://codereview.chromium.org/2540773003/diff/40001/components/cronet/andro...
components/cronet/android/cronet_impl_native_proguard.cfg:1: -keep class
org.chromium.net.impl.CronetUrlRequest$HeadersList
Maybe add comment:

 # Proguard config for apps that depends on cronet_impl_native_java.jar.

[kapishnikov, 2016-11-30 22:34:01]

https://codereview.chromium.org/2540773003/diff/40001/components/cronet/andro...
File components/cronet/android/BUILD.gn (right):

https://codereview.chromium.org/2540773003/diff/40001/components/cronet/andro...
components/cronet/android/BUILD.gn:1053:
rebase_path("//components/cronet/android/cronet_impl_native_proguard.cfg",
On 2016/11/30 22:13:45, mef wrote:
> nit: Should this file be first, so generated file starts with its content
> (including comment)?

Done.

https://codereview.chromium.org/2540773003/diff/40001/components/cronet/andro...
File components/cronet/android/cronet_impl_native_proguard.cfg (right):

https://codereview.chromium.org/2540773003/diff/40001/components/cronet/andro...
components/cronet/android/cronet_impl_native_proguard.cfg:1: -keep class
org.chromium.net.impl.CronetUrlRequest$HeadersList
On 2016/11/30 22:13:45, mef wrote:
> Maybe add comment:
> 
>  # Proguard config for apps that depends on cronet_impl_native_java.jar.

Done.

[mef, 2016-11-30 22:42:34]

lgtm

https://codereview.chromium.org/2540773003/diff/60001/components/cronet/andro...
File components/cronet/android/BUILD.gn (right):

https://codereview.chromium.org/2540773003/diff/60001/components/cronet/andro...
components/cronet/android/BUILD.gn:20: _package_dir = "$root_out_dir/cronet"
FWIW this could go back to line 786.

[kapishnikov, 2016-11-30 22:49:29]

https://codereview.chromium.org/2540773003/diff/60001/components/cronet/andro...
File components/cronet/android/BUILD.gn (right):

https://codereview.chromium.org/2540773003/diff/60001/components/cronet/andro...
components/cronet/android/BUILD.gn:20: _package_dir = "$root_out_dir/cronet"
On 2016/11/30 22:42:33, mef wrote:
> FWIW this could go back to line 786.

Done.

[kapishnikov, 2016-12-01 16:23:31]

The CQ bit was checked by kapishnikov@chromium.org

[kapishnikov, 2016-12-01 16:23:31]

The patchset sent to the CQ was uploaded after l-g-t-m from mef@chromium.org
Link to the patchset: https://codereview.chromium.org/2540773003/#ps80001
(title: "Moved the definition of _package_dir var to its original location")

[commit-bot: I haz the power, 2016-12-01 16:23:45]

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, 2016-12-01 17:21:42]

CQ is committing da patch.

Bot data: {"patchset_id": 80001, "attempt_start_ts": 1480609411500010,
"parent_rev": "3e6a363a844fc2db5d17e282562be2b8b93e4f27", "commit_rev":
"0a76bf8a0beba9374bfe54004db7498f0b2bb766"}

[commit-bot: I haz the power, 2016-12-01 17:22:09]

Description was changed from

==========
[Cronet] Add proguard files for different Cronet packaging

1. Created three proguard files:
1.1. cronet_impl_common_proguard.cfg - for apps that depend on
cronet_impl_common_java.jar
1.2. cronet_impl_platform_proguard.cfg - for apps that depend on
cronet_impl_platform_java.jar
1.3. cronet_impl_native_proguard.cfg - for apps that depend on
cronet_impl_native_java.jar

2. Enabled proguarding of cronet_sample_apk even for debug builds.

3. Changed cronet_sample_apk & cronet_perf_test_apk to test with proguard
   configs that we ship.

BUG=665446
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.android:android_cronet_tester
==========

to

==========
[Cronet] Add proguard files for different Cronet packaging

1. Created three proguard files:
1.1. cronet_impl_common_proguard.cfg - for apps that depend on
cronet_impl_common_java.jar
1.2. cronet_impl_platform_proguard.cfg - for apps that depend on
cronet_impl_platform_java.jar
1.3. cronet_impl_native_proguard.cfg - for apps that depend on
cronet_impl_native_java.jar

2. Enabled proguarding of cronet_sample_apk even for debug builds.

3. Changed cronet_sample_apk & cronet_perf_test_apk to test with proguard
   configs that we ship.

BUG=665446
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.android:android_cronet_tester
==========

[commit-bot: I haz the power, 2016-12-01 17:22:10]

Committed patchset #5 (id:80001)

[commit-bot: I haz the power, 2016-12-01 17:24:05]

Description was changed from

==========
[Cronet] Add proguard files for different Cronet packaging

1. Created three proguard files:
1.1. cronet_impl_common_proguard.cfg - for apps that depend on
cronet_impl_common_java.jar
1.2. cronet_impl_platform_proguard.cfg - for apps that depend on
cronet_impl_platform_java.jar
1.3. cronet_impl_native_proguard.cfg - for apps that depend on
cronet_impl_native_java.jar

2. Enabled proguarding of cronet_sample_apk even for debug builds.

3. Changed cronet_sample_apk & cronet_perf_test_apk to test with proguard
   configs that we ship.

BUG=665446
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.android:android_cronet_tester
==========

to

==========
[Cronet] Add proguard files for different Cronet packaging

1. Created three proguard files:
1.1. cronet_impl_common_proguard.cfg - for apps that depend on
cronet_impl_common_java.jar
1.2. cronet_impl_platform_proguard.cfg - for apps that depend on
cronet_impl_platform_java.jar
1.3. cronet_impl_native_proguard.cfg - for apps that depend on
cronet_impl_native_java.jar

2. Enabled proguarding of cronet_sample_apk even for debug builds.

3. Changed cronet_sample_apk & cronet_perf_test_apk to test with proguard
   configs that we ship.

BUG=665446
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.android:android_cronet_tester

Committed: https://crrev.com/cfb46293103925f18c3931a44044ee1a0776345c
Cr-Commit-Position: refs/heads/master@{#435633}
==========

[commit-bot: I haz the power, 2016-12-01 17:24:06]

Patchset 5 (id:??) landed as
https://crrev.com/cfb46293103925f18c3931a44044ee1a0776345c
Cr-Commit-Position: refs/heads/master@{#435633}