[Cronet] Add proguard files for different Cronet packaging

components/cronet/android/BUILD.gn

 # Copyright 2015 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.
 
 import("//build/buildflag_header.gni")
 import("//build/config/android/config.gni")
 import("//build/config/android/rules.gni")
 import("//build/util/process_version.gni")
 import("//build/util/version.gni")
 import("//testing/test.gni")
 import("//third_party/protobuf/proto_library.gni")
 import("//url/features.gni")
 
 assert(!is_component_build, "Cronet requires static library build.")
 
 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",
     "java/src/org/chromium/net/impl/CronetLibraryLoader.java",
     "java/src/org/chromium/net/impl/CronetUploadDataStream.java",
     "java/src/org/chromium/net/impl/CronetUrlRequest.java",
     "java/src/org/chromium/net/impl/CronetUrlRequestContext.java",
   ]
   jni_package = "cronet"
 }
@@ skipping 385 matching lines @@
 
   run_findbugs_override = true
 }
 
 android_apk("cronet_sample_apk") {
   apk_name = "CronetSample"
   android_manifest = "sample/AndroidManifest.xml"
   shared_libraries = [ ":cronet" ]
 
   deps = [
+    ":cronet_combine_proguard_flags",
     ":cronet_sample_apk_java",
     ":cronet_sample_apk_resources",
     "//base:base_java",
     "//third_party/jsr-305:jsr_305_javalib",
   ]
 
   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
 # cronet_sample_apk_resources. The two have to be different targets because
 # targets which are common between the "instrumentation test apk" and the
 # "tested apk" are removed from the "instrumentation test apk".
 android_resources("cronet_sample_test_apk_resources") {
   resource_dirs = [ "sample/res" ]
   android_manifest = "sample/javatests/AndroidManifest.xml"
 }
@@ skipping 12 matching lines @@
     ":cronet_impl_all_java",
     ":cronet_sample_apk_java",
     ":cronet_sample_test_apk_resources",
     "//base:base_java",
     "//base:base_java_test_support",
     "//net/android:net_java_test_support",
   ]
   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") {
   testonly = true
   sources = [
     "test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java",
     "test/src/org/chromium/net/CronetTestUtil.java",
     "test/src/org/chromium/net/MockCertVerifier.java",
     "test/src/org/chromium/net/MockUrlRequestJobFactory.java",
     "test/src/org/chromium/net/NativeTestServer.java",
@@ skipping 252 matching lines @@
 android_apk("cronet_perf_test_apk") {
   testonly = true
   apk_name = "CronetPerfTest"
   android_manifest = "test/javaperftests/AndroidManifest.xml"
   shared_libraries = [
     ":cronet",
     ":cronet_tests",
   ]
 
   deps = [
+    ":cronet_combine_proguard_flags",
     ":cronet_perf_test_apk_java",
     ":cronet_test_apk_java",
     "//base:base_java",
   ]
 
   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",
   ]
 }
 
 test("cronet_unittests") {
   sources = [
     "//components/cronet/android/cert/cert_verifier_cache_serializer_unittest.cc",
     "//components/cronet/histogram_manager_unittest.cc",
     "//components/cronet/run_all_unittests.cc",
     "//components/cronet/stale_host_resolver_unittest.cc",
     "//components/cronet/url_request_context_config_unittest.cc",
   ]
 
   deps = [
     ":cronet_android_cert_proto",
     ":cronet_static",
     "//base",
     "//base/test:test_support",
     "//components/metrics",
     "//net",
     "//net:test_support",
     "//testing/gtest",
   ]
 
   if (is_android) {
     shard_timeout = 180
   }
 }
 
-_package_dir = "$root_out_dir/cronet"
 _extract_cronet_jars_dir = "$target_gen_dir/cronet_jar_extract"
 
 action("extract_cronet_jars") {
   # extract_from_jars.py deletes the target directory before extracting.
   script = "//components/cronet/tools/extract_from_jars.py"
   depfile = "$target_gen_dir/$target_name.d"
 
   sources = [
     "$root_out_dir/lib.java/base/base_java.jar",
     "$root_out_dir/lib.java/components/cronet/android/cronet_impl_native_java.jar",
@@ skipping 219 matching lines @@
   ]
 }
 
 copy("cronet_package_copy") {
   sources = [
     "$root_out_dir/lib.java/components/cronet/android/cronet_api.jar",
     "$root_out_dir/lib.java/components/cronet/android/cronet_impl_common_java.jar",
     "$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}}",
   ]
 
   deps = [
     ":cronet_api_java",
     ":cronet_impl_common_java",
     ":cronet_impl_platform_java",
   ]
 }
 
 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),
   ]
 }
 
 copy("cronet_package_copy_native_lib") {
   sources = [
     "$root_out_dir/libcronet.so",
   ]
   outputs = [
     "$_package_dir/libs/${android_app_abi}/libcronet.so",
   ]
@@ skipping 54 matching lines @@
       ":jar_cronet_impl_native_java_source",
       ":jar_cronet_impl_platform_java_source",
       ":jar_cronet_sample_source",
       ":repackage_extracted_jars",
     ]
     if (current_cpu == "arm" && arm_version == 7) {
       deps += [ ":enforce_no_neon" ]
     }
   }
 }