[Cronet] Add proguard files for different Cronet packaging

components/cronet/android/BUILD.gn

Index: components/cronet/android/BUILD.gn
diff --git a/components/cronet/android/BUILD.gn b/components/cronet/android/BUILD.gn
index a15f26da73d0884f6b9da8c0775830a616bccaf4..8114cd9b21df5b2739a98f402d962e73c5c60c51 100644
--- a/components/cronet/android/BUILD.gn
+++ b/components/cronet/android/BUILD.gn
@@ -17,6 +17,8 @@ declare_args() {
   cronet_enable_data_reduction_proxy_support = false
 }
 
+_package_dir = "$root_out_dir/cronet"
+
 generate_jni("cronet_jni_headers") {
   sources = [
     "java/src/org/chromium/net/impl/CronetBidirectionalStream.java",
@@ -422,6 +424,7 @@ android_apk("cronet_sample_apk") {
   shared_libraries = [ ":cronet" ]
 
   deps = [
+    ":cronet_combine_proguard_flags",
     ":cronet_sample_apk_java",
     ":cronet_sample_apk_resources",
     "//base:base_java",
@@ -429,15 +432,13 @@ android_apk("cronet_sample_apk") {
   ]
 
   run_findbugs_override = true
-  if (!is_java_debug) {
-    proguard_enabled = true
-    proguard_configs = [
-      "proguard.cfg",
-      "sample/javatests/proguard.cfg",
-      "//base/android/proguard/chromium_apk.flags",
-      "//base/android/proguard/chromium_code.flags",
-    ]
-  }
+  proguard_enabled = true
+  proguard_configs = [
+    "$_package_dir/proguard_native.cfg",

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

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]

Good idea. Done!

+    "proguard_common.cfg",
+    "sample/javatests/proguard.cfg",
+    "//base/android/proguard/chromium_apk.flags",
+  ]
 }
 
 # cronet_sample_test_apk_resources is identical to
@@ -470,7 +471,7 @@ instrumentation_test_apk("cronet_sample_test_apk") {
   additional_apks = [ "//net/android:net_test_support_apk" ]
 
   run_findbugs_override = true
-  proguard_enabled = !is_java_debug
+  proguard_enabled = true
 }
 
 generate_jni("cronet_tests_jni_headers") {
@@ -743,6 +744,7 @@ android_apk("cronet_perf_test_apk") {
   ]
 
   deps = [
+    ":cronet_combine_proguard_flags",
     ":cronet_perf_test_apk_java",
     ":cronet_test_apk_java",
     "//base:base_java",
@@ -751,10 +753,10 @@ android_apk("cronet_perf_test_apk") {
   run_findbugs_override = true
   proguard_enabled = true
   proguard_configs = [
-    "proguard.cfg",
+    "$_package_dir/proguard_native.cfg",
+    "proguard_common.cfg",
     "test/javaperftests/proguard.cfg",
     "//base/android/proguard/chromium_apk.flags",
-    "//base/android/proguard/chromium_code.flags",
   ]
 }
 
@@ -783,7 +785,6 @@ test("cronet_unittests") {
   }
 }
 
-_package_dir = "$root_out_dir/cronet"
 _extract_cronet_jars_dir = "$target_gen_dir/cronet_jar_extract"
 
 action("extract_cronet_jars") {
@@ -1023,6 +1024,8 @@ copy("cronet_package_copy") {
     "$root_out_dir/lib.java/components/cronet/android/cronet_impl_platform_java.jar",
     "//AUTHORS",
     "//chrome/VERSION",
+    "proguard_common.cfg",
+    "proguard_platform.cfg",
   ]
   outputs = [
     "$_package_dir/{{source_file_part}}",
@@ -1038,14 +1041,14 @@ copy("cronet_package_copy") {
 action("cronet_combine_proguard_flags") {
   script = "//components/cronet/tools/generate_proguard_file.py"
   outputs = [
-    "$_package_dir/proguard.cfg",
+    "$_package_dir/proguard_native.cfg",
   ]
-
   args = [
     "--output-file",
-    rebase_path("$_package_dir/proguard.cfg", root_build_dir),
+    rebase_path("$_package_dir/proguard_native.cfg", root_build_dir),
     rebase_path("//base/android/proguard/chromium_code.flags", root_build_dir),
-    rebase_path("//components/cronet/android/proguard.cfg", root_build_dir),
+    rebase_path("//components/cronet/android/proguard_native.cfg",
+                root_build_dir),
   ]
 }